Changeset 8955 in orxonox.OLD

Timestamp:

Jun 30, 2006, 2:25:36 PM (18 years ago)

Author:

patrick

Message:

animations do not jump now

File:

• branches/single_player_map/src/world_entities/npcs/generic_npc.cc (modified) (2 diffs)

branches/single_player_map/src/world_entities/npcs/generic_npc.cc

@@ -183 +183 @@
     {
       case Walk:
-        this->setAnimation(RUN, MD2_ANIM_LOOP);
+        if( this->getAnimation() != RUN)
+          this->setAnimation(RUN, MD2_ANIM_LOOP);
         break;
       case Run:
-        this->setAnimation(RUN, MD2_ANIM_LOOP);
+        if( this->getAnimation() != RUN)
+          this->setAnimation(RUN, MD2_ANIM_LOOP);
         break;
       case Crouch:
-        this->setAnimation(CROUCH_WALK, MD2_ANIM_LOOP);
+        if( this->getAnimation() != CROUCH_WALK)
+          this->setAnimation(CROUCH_WALK, MD2_ANIM_LOOP);
         break;
       case LookAt:
+        if( this->getAnimation() != STAND)
+          this->setAnimation(STAND, MD2_ANIM_LOOP);
+        break;
+      case Shoot:
+        if( this->getAnimation() != STAND)
         this->setAnimation(STAND, MD2_ANIM_LOOP);
-
-        break;
-      case Shoot:
-        this->setAnimation(STAND, MD2_ANIM_LOOP);
         break;
 
       default:
+        if( this->getAnimation() != STAND)
         this->setAnimation(STAND, MD2_ANIM_LOOP);
         break;
@@ -218 +223 @@
   anim.v = coordinate;
   anim.type = Walk;
-  anim.speed = 20.0f;
-
-  this->behaviourList.push_back(anim);
+  anim.speed = 30.0f;
+
+  if( this->behaviourList.empty())
+  {
+    this->behaviourList.push_back(anim);
+  }
+  else
+    this->behaviourList.push_back(anim);
 }