Changeset 8685 in orxonox.OLD for branches/bsp_model/src/world_entities

Timestamp:

Jun 21, 2006, 8:52:20 PM (19 years ago)

Author:

patrick

Message:

bsp: fps player added, woking on it

Location:

branches/bsp_model/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• creatures/fps_player.cc (added)
• creatures/fps_player.h (added)
• creatures/md2_creature.cc (modified) (1 diff)

branches/bsp_model/src/world_entities/WorldEntities.am

@@ -42 +42 @@
                 world_entities/space_ships/collision_probe.cc \
                 world_entities/creatures/md2_creature.cc \
+                world_entities/creatures/fps_player.cc \
                 world_entities/spectator.cc \
                 \
@@ -98 +99 @@
                 space_ships/collision_probe.cc \
                 creatures/md2_creature.h \
+                creatures/fps_player.h \
                 spectator.h \
                 \

branches/bsp_model/src/world_entities/creatures/md2_creature.cc

@@ -262 +262 @@
   else if( this->bFire && likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK)
+    if( ((MD2Model*)this->getModel(0))->getAnimation() != ATTACK)
       ((MD2Model*)this->getModel(0))->setAnimation(ATTACK);
   }
   else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != RUN)
+    if( ((MD2Model*)this->getModel(0))->getAnimation() != RUN)
       ((MD2Model*)this->getModel(0))->setAnimation(RUN);
   }
   else if (likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != STAND)
+    if( ((MD2Model*)this->getModel(0))->getAnimation() != STAND)
       ((MD2Model*)this->getModel(0))->setAnimation(STAND);
   }