Changeset 9062 in orxonox.OLD

Timestamp:

Jul 3, 2006, 6:59:18 PM (18 years ago)

Author:

patrick

Message:

merged branche single_player_map back to trunk

Location:

trunk/src

Files:

• lib/collision_reaction/cr_defs.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

trunk/src/lib/collision_reaction/cr_defs.h

@@ -30 +30 @@
 //!< the collision axis x collision event
 #define COLLISION_TYPE_AXIS_X      1
-#define COLLISION_TZPE_AXIS_X_NEG  2
+#define COLLISION_TYPE_AXIS_X_NEG  2
 //!< the collision axis y collision event
 #define COLLISION_TYPE_AXIS_Y      3

trunk/src/world_entities/player.cc

@@ -75 +75 @@
     PRINTF(4)("Enter new Playable\n");
     this->playable = playable;
-    this->hud.setEnergyWidget(this->playable->getHealthWidget());
-    this->hud.setWeaponManager(&this->playable->getWeaponManager());
+    this->_hud.setEnergyWidget(this->playable->getHealthWidget());
+    this->_hud.setWeaponManager(&this->playable->getWeaponManager());
 
     this->playable->setPlayer(this);