- Timestamp:
- Jul 12, 2010, 1:08:58 PM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/network2 (added) merged: 6448-6450,6455-6458,6462,6464-6465
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h
r7075 r7153 50 50 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 51 51 virtual void tick(float dt); 52 void registerVariables();53 52 54 53 inline bool isAlive() const … … 166 165 167 166 private: 167 void registerVariables(); 168 168 inline void setWeaponSystem(WeaponSystem* weaponsystem) 169 169 { this->weaponSystem_ = weaponsystem; }
Note: See TracChangeset
for help on using the changeset viewer.