Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/world_entities/player.h

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/world_entities/player.h (modified) (2 diffs)

orxonox/branches/physics/src/world_entities/player.h

@@ -11 +11 @@
 template<class T> class tList;
 class Weapon;
+class WeaponManager;
 class Vector;
 class World;
@@ -49 +50 @@
   Weapon* activeWeapon;  //!< the weapon that is currenty activated
   Weapon* activeWeaponL;  //temporary -- FIX THIS
+  WeaponManager* weaponMan; //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
 
   World* myWorld;        //!< reference to the world object