Changeset 6372 in orxonox.OLD for branches/network/src/story_entities/campaign.h

Timestamp:

Dec 31, 2005, 2:41:02 PM (18 years ago)

Author:

patrick

Message:

network: more cleanup in the StoryEntity, thightening the interface and function renames

File:

• branches/network/src/story_entities/campaign.h (modified) (1 diff)

branches/network/src/story_entities/campaign.h

@@ -10 +10 @@
 class TiXmlElement;
 
-class Campaign : public StoryEntity {
+class Campaign : public StoryEntity
+{
 
- public:
-  Campaign ();
-  Campaign ( TiXmlElement* root);
-  virtual ~Campaign ();
+  public:
+    Campaign ();
+    Campaign ( TiXmlElement* root);
+    virtual ~Campaign ();
 
-  void loadParams(const TiXmlElement* root);
-  void loadWorldListParams(const TiXmlElement* root);
+    void loadParams(const TiXmlElement* root);
+    void loadWorldListParams(const TiXmlElement* root);
 
-  StoryEntity* currentEntity;
+    virtual ErrorMessage init();
+    virtual ErrorMessage start();
+    virtual ErrorMessage start(int storyID);
+    virtual ErrorMessage pause();
+    virtual ErrorMessage resume();
+    virtual ErrorMessage stop();
 
-  virtual ErrorMessage init();
-  virtual ErrorMessage start();
-  virtual ErrorMessage start(int storyID);
-  virtual ErrorMessage pause();
-  virtual ErrorMessage resume();
-  virtual ErrorMessage stop();
+    void addEntity(StoryEntity* se, int storyID);
+    void addEntity(StoryEntity* se);
+    void removeEntity(int storyID);
+    void removeEntity(StoryEntity* se);
 
-  void addEntity(StoryEntity* se, int storyID);
-  void addEntity(StoryEntity* se);
-  void removeEntity(int storyID);
-  void removeEntity(StoryEntity* se);
+    void nextLevel();
+    void previousLevel();
 
-  void nextLevel();
-  void previousLevel();
 
- private:
-  //ListTemplate<StoryEntity>* entities;
-   std::list<StoryEntity*> entities;
-   bool running;
+  private:
+    StoryEntity* getStoryEntity(int storyID);
 
-   StoryEntity* getStoryEntity(int storyID);
+
+  private:
+    StoryEntity* currentEntity;
+    std::list<StoryEntity*> entities;
+    bool running;
+
 };