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

Timestamp:

Jan 2, 2006, 11:00:14 PM (20 years ago)

Author:

patrick

Message:

network: much more work on the StoryEntity functions and reimplementations of the DataTanks of each StoryEntity

File:

• branches/network/src/story_entities/campaign.h (modified) (3 diffs)

branches/network/src/story_entities/campaign.h

@@ -25 +25 @@
 
     void loadParams(const TiXmlElement* root);
-    void loadWorldListParams(const TiXmlElement* root);
 
-    virtual ErrorMessage init();
-    virtual ErrorMessage start();
-    virtual ErrorMessage pause();
-    virtual ErrorMessage resume();
-    virtual ErrorMessage stop();
+    virtual bool start();
+    virtual bool stop();
+    virtual bool pause();
+    virtual bool resume();
+    virtual void run();
 
     void switchToNextLevel();
@@ -44 +43 @@
 
 //! A class that contains the data of the Campaign object
-class CampaignData : virtual public BaseObject
+class CampaignData : public BaseObject
 {
 
   public:
-    CampaignData();
+    CampaignData(const TiXmlElement* root);
     virtual ~CampaignData();
+
+    void loadParams(const TiXmlElement* root);
 
     void addStoryEntity(StoryEntity* se);
@@ -58 +59 @@
 
   private:
+    void loadParamsWorldList(const TiXmlElement* root);
+
+
+  private:
     StoryEntity*                  currentEntity;                //!< reference to the currently used StoryEntity
     std::list<StoryEntity*>       storyEntities;                //!< list of story entities