- Timestamp:
- Dec 17, 2008, 2:10:11 AM (15 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
/code/branches/weapon2 (added) merged: 2108,2145,2186,2203,2232,2272-2273,2288,2308,2319,2327,2331,2337,2347,2354,2366-2368,2379,2391,2393,2398,2410
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h
r2485 r2493 34 34 #include "objects/worldentities/ControllableEntity.h" 35 35 #include "objects/RadarViewable.h" 36 #include "objects/weaponSystem/WeaponSystem.h" 36 37 37 38 namespace orxonox … … 75 76 virtual void kill(); 76 77 77 virtual void fire( );78 virtual void fire(WeaponMode::Enum fireMode); 78 79 79 80 virtual void postSpawn(); 81 82 void setWeaponSlot(WeaponSlot * wSlot); 83 WeaponSlot * getWeaponSlot(unsigned int index) const; 84 void setWeaponPack(WeaponPack * wPack); 85 WeaponPack * getWeaponPack(unsigned int firemode) const; 86 void setWeaponSet(WeaponSet * wSet); 87 WeaponSet * getWeaponSet(unsigned int index) const; 80 88 81 89 inline const WorldEntity* getWorldEntity() const … … 111 119 112 120 WeaponSystem* weaponSystem_; 121 unsigned int fire_; 113 122 114 123 std::string spawnparticlesource_; … … 117 126 }; 118 127 119 class _OrxonoxExport PawnListener : public OrxonoxClass128 class _OrxonoxExport PawnListener : virtual public OrxonoxClass 120 129 { 121 130 friend class Pawn;
Note: See TracChangeset
for help on using the changeset viewer.