Changeset 9061 in orxonox.OLD for trunk/src/world_entities/npcs/generic_npc.h

Timestamp:

Jul 3, 2006, 6:39:10 PM (19 years ago)

Author:

patrick

Message:

merged the single_player branche to trunk

File:

• trunk/src/world_entities/npcs/generic_npc.h (modified) (5 diffs)

trunk/src/world_entities/npcs/generic_npc.h

@@ -12 +12 @@
 
 #include "sound_source.h"
+
+#include <stack>
+
 
 namespace OrxSound{ class SoundSource; }
@@ -35 +38 @@
 
 
-  bool finalGoalReached() { return this->behaviourList.empty(); };
+  bool finalGoalReached() { return this->behaviourList->empty(); };
 
   /* npc controlling functions to be Queued */
@@ -52 +55 @@
   /* stopping the movement */
   void stop();
+  void resume();
   void nextStep();
 
@@ -68 +72 @@
   /* some generic control funtions */
   void playAnimation(int animationIndex, int animPlaybackMode);
-  void playSound(std::string filename);
-  void playSound(int i);
+  void playSound(const std::string& filename);
 
   virtual void tick (float time);
@@ -123 +126 @@
    float                                   soundVolume;
 
-   std::list<GenericNPC::Anim>             behaviourList;
+   std::list<GenericNPC::Anim>*            behaviourList;
+   std::stack<std::list<GenericNPC::Anim>*> animationStack;
    Vector                                  destCoor;
    Quaternion                              destDir;