Changeset 8490 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Jun 15, 2006, 9:34:48 PM (19 years ago)

Author:

patrick

Message:

merged the bsp branche back to trunk

File:

• trunk/src/world_entities/creatures/md2_creature.cc (modified) (2 diffs)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -21 +21 @@
 
 #include "objModel.h"
-#include "md2Model.h"
+#include "md2/md2Model.h"
 #include "util/loading/resource_manager.h"
 #include "state.h"
@@ -256 +256 @@
   if( this->bJump && likely(this->getModel(0) != NULL))
   {
-    ((MD2Model*)this->getModel(0))->setAnim(JUMP);
+    ((MD2Model*)this->getModel(0))->setAnimation(JUMP);
   }
   else if( this->bFire && likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK) ((MD2Model*)this->getModel(0))->setAnim(ATTACK);
+    if( ((MD2Model*)this->getModel(0))->getAnim() != 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) ((MD2Model*)this->getModel(0))->setAnim(RUN);
+    if( ((MD2Model*)this->getModel(0))->getAnim() != RUN) ((MD2Model*)this->getModel(0))->setAnimation(RUN);
   }
   else if (likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnim(STAND);
+    if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnimation(STAND);
   }