Changeset 6417 for code/trunk/src/orxonox/worldentities/pawns/Pawn.h
- Timestamp:
- Dec 25, 2009, 10:23:58 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/pawns/Pawn.h
r5781 r6417 75 75 { return this->lastHitOriginator_; } 76 76 77 virtual void damage(float damage, Pawn* originator = 0);78 77 virtual void hit(Pawn* originator, const Vector3& force, float damage); 78 virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage); 79 79 virtual void kill(); 80 80 81 virtual void fire (unsigned int firemode);81 virtual void fired(unsigned int firemode); 82 82 virtual void reload(); 83 virtual void doFire(uint8_t firemode);84 83 virtual void postSpawn(); 85 84 … … 89 88 WeaponSet * getWeaponSet(unsigned int index) const; 90 89 void addWeaponPack(WeaponPack * wPack); 90 void addWeaponPackXML(WeaponPack * wPack); 91 91 WeaponPack * getWeaponPack(unsigned int index) const; 92 92 … … 117 117 virtual void startLocalHumanControl(); 118 118 119 void setAimPosition( Vector3 position ) 120 { this->aimPosition_ = position; } 121 Vector3 getAimPosition() 122 { return this->aimPosition_; } 123 119 124 protected: 120 125 virtual void setPlayer(PlayerInfo* player); … … 125 130 virtual void deatheffect(); 126 131 virtual void spawneffect(); 132 133 virtual void damage(float damage, Pawn* originator = 0); 127 134 128 135 bool bAlive_; … … 146 153 inline void setWeaponSystem(WeaponSystem* weaponsystem) 147 154 { this->weaponSystem_ = weaponsystem; } 155 156 Vector3 aimPosition_; 148 157 }; 149 158 }
Note: See TracChangeset
for help on using the changeset viewer.