- Timestamp:
- Nov 5, 2008, 7:57:16 PM (16 years ago)
- Location:
- code/branches/weapon2/src/orxonox/objects/worldentities/pawns
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc
r2106 r2145 35 35 #include "objects/infos/PlayerInfo.h" 36 36 #include "objects/gametypes/Gametype.h" 37 #include "objects/weaponSystem/WeaponSystem.h" 37 38 38 39 39 namespace orxonox … … 54 54 this->weaponSystem_ = 0; 55 55 56 //WeaponSystem 57 weaponSystem_ = new WeaponSystem(this); 56 58 /* 57 //WeaponSystem58 weaponSystem_ = new WeaponSystem();59 59 WeaponSet * weaponSet1 = new WeaponSet(1); 60 60 this->weaponSystem_->attachWeaponSet(weaponSet1); … … 137 137 } 138 138 139 void Pawn::fire( )139 void Pawn::fire(WeaponMode::Enum fireMode) 140 140 { 141 141 if (this->weaponSystem_) 142 this->weaponSystem_->fire( );142 this->weaponSystem_->fire(fireMode); 143 143 } 144 144 -
code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.h
r2098 r2145 33 33 34 34 #include "objects/worldentities/ControllableEntity.h" 35 #include "objects/weaponSystem/WeaponSystem.h" 35 36 36 37 namespace orxonox … … 74 75 virtual void kill(); 75 76 76 virtual void fire( );77 virtual void fire(WeaponMode::Enum fireMode); 77 78 78 79 virtual void postSpawn();
Note: See TracChangeset
for help on using the changeset viewer.