- Timestamp:
- May 12, 2016, 4:02:21 PM (8 years ago)
- Location:
- code/branches/tgidronFS16
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/tgidronFS16
- Property svn:mergeinfo changed
/code/trunk (added) merged: 11156-11157,11160-11161,11176
- Property svn:mergeinfo changed
-
code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h
r11071 r11184 218 218 { return this->weaponSystem_; } 219 219 220 static void consoleCommand_debugDrawWeapons(bool bDraw); 221 220 222 protected: 221 223 virtual void preDestroy() override; … … 233 235 234 236 bool bAlive_; 235 bool bVulnerable_; ///< If false the pawn may not ged damaged237 bool bVulnerable_; ///< If this is false, then the pawn may not take damage 236 238 237 239 virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const override … … 269 271 inline void setWeaponSystem(WeaponSystem* weaponsystem) 270 272 { this->weaponSystem_ = weaponsystem; } 273 void drawWeapons(bool bDraw); 271 274 272 275 Vector3 aimPosition_; 273 276 274 277 WorldSound* explosionSound_; // TODO: Does this really belong here? Maybe move it to BigExplosion? 278 279 std::vector<Model*> debugWeaponSlotModels_; 275 280 276 281 }; // tolua_export
Note: See TracChangeset
for help on using the changeset viewer.