Changeset 3238 in orxonox.OLD for orxonox/branches/buerli/src/campaign.h

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/buerli/src/campaign.h (modified) (3 diffs)

orxonox/branches/buerli/src/campaign.h

@@ -1 +1 @@
 
-#ifndef CAMPAIGN_H
-#define CAMPAIGN_H
+#ifndef _CAMPAIGN_H
+#define _CAMPAIGN_H
 
 #include "stdincl.h"
@@ -17 +17 @@
   StoryEntity* currentEntity;
 
-  virtual Error init();
-  virtual Error start();
-  virtual Error start(Uint32 storyID);
-  virtual Error stop();
-  virtual Error pause();
-  virtual Error resume();
+  virtual ErrorMessage init();
+  virtual ErrorMessage start();
+  virtual ErrorMessage start(int storyID);
+  virtual ErrorMessage stop();
+  virtual ErrorMessage pause();
+  virtual ErrorMessage resume();
 
-  void addEntity(StoryEntity* se, Uint32 storyID);
+  virtual void destroy();
+
+  void addEntity(StoryEntity* se, int storyID);
   void addEntity(StoryEntity* se);
-  void removeEntity(Uint32 storyID);
+  void removeEntity(int storyID);
   void removeEntity(StoryEntity* se);
   
@@ -33 +35 @@
 
  private:
-  List<StoryEntity>* entities;
+  ListTemplate<StoryEntity>* entities;
   bool running;
 
-  StoryEntity* getStoryEntity(Uint32 storyID);
+  StoryEntity* getStoryEntity(int storyID);
 };
 
-#endif
+#endif /* _CAMPAIGN_H */