Changeset 6371 in orxonox.OLD

Timestamp:

Dec 31, 2005, 2:32:08 PM (18 years ago)

Author:

patrick

Message:

network: thown some old story entity functions away

Location:

branches/network/src/story_entities

Files:

• campaign.cc (modified) (3 diffs)
• campaign.h (modified) (1 diff)
• game_world.cc (modified) (1 diff)
• game_world.h (modified) (1 diff)
• story_entity.cc (modified) (2 diffs)
• story_entity.h (modified) (1 diff)

branches/network/src/story_entities/campaign.cc

@@ -132 +132 @@
       se->preStart();
       se->start();
-      se->destroy();
 
       int nextWorldID = se->getNextStoryID();
@@ -189 +188 @@
 }
 
-
+/*
 ErrorMessage Campaign::destroy()
 {
@@ -198 +197 @@
       this->currentEntity = NULL;
     }
-}
+}*/
 
 

branches/network/src/story_entities/campaign.h

@@ -28 +28 @@
   virtual ErrorMessage resume();
   virtual ErrorMessage stop();
-  virtual ErrorMessage destroy();
 
   void addEntity(StoryEntity* se, int storyID);

branches/network/src/story_entities/game_world.cc

@@ -406 +406 @@
 }
 
-/**
- *  destroys the GameWorld
-*/
-ErrorMessage GameWorld::destroy()
-{
-
-}
 
 /**

branches/network/src/story_entities/game_world.h

@@ -44 +44 @@
     virtual ErrorMessage pause();
     virtual ErrorMessage resume();
-    virtual ErrorMessage destroy();
 
     virtual void displayLoadScreen();

branches/network/src/story_entities/story_entity.cc

@@ -23 +23 @@
 
 
-
+/**
+ * default constructor initializes all needed data
+ */
 StoryEntity::StoryEntity ()
 {
@@ -33 +35 @@
 }
 
+
+/** deconstructor
+ */
 StoryEntity::~StoryEntity () {}
 
 
-/**
-  *  sets the story ID
-
-    sets the story id of the current entity, this enables it to be identified in a
-    global context.
-*/
-void StoryEntity::setStoryID(int storyID)
-{
-  this->storyID = storyID;
-}
-
-
-/**
-  *  this reads the story id of the current entity
-  * @returns the story entity id
-*/
-int StoryEntity::getStoryID()
-{
-  return this->storyID;
-}
-
-
-/**
-  *  sets the id of the next story entity
-
-    StoryEntities can choose their following entity themselfs. the entity id defined here
-    will be startet after this entity ends. this can be convenient if you want to have a
-    non linear story with switches.
-*/
-void StoryEntity::setNextStoryID(int nextStoryID)
-{
-  this->nextStoryID = nextStoryID;
-}
-
-/**
-  *  gets the story id of the current entity
-  * @returns story id
-*/
-int StoryEntity::getNextStoryID()
-{
-  return this->nextStoryID;
-}

branches/network/src/story_entities/story_entity.h

@@ -20 +20 @@
 
   // INIT AND LOAD //
-  /** @brief initializes a Story Entity to default Values */
+  /** initializes a Story Entity to default Values */
   virtual ErrorMessage init() {};
-  /** @brief called before loading */
+  /** called before loading */
   virtual ErrorMessage preLoad() {};
-  /** @brief called to load. */
+  /** called to load. */
   virtual ErrorMessage load() {};
-  /** @brief called right after loading */
+  /** called right after loading */
   virtual ErrorMessage postLoad() {};
-  /** @brief called after postload to check for integrity. (optional) */
+  /** called after postload to check for integrity. (optional) */
   virtual ErrorMessage check() {};
 
   // RUNNING //
-  /** @brief called shortly before starting the Entity */
+  /** called shortly before starting the Entity */
   virtual ErrorMessage preStart() {};
-  /** @brief starts the Entity. Starts the main cycle */
+  /** starts the Entity. Starts the main cycle */
   virtual ErrorMessage start() = 0;
-  /** @brief pauses the Entity. call to resume required to get it running again */
+  /** pauses the Entity. call to resume required to get it running again */
   virtual ErrorMessage pause() = 0;
-  /** @brief resumes the Entity after a stop/pause or suspend. */
+  /** resumes the Entity after a stop/pause or suspend. */
   virtual ErrorMessage resume() = 0;
-  /** @brief suspends the Entity detaches all mayor functions  (optional) */
+  /** suspends the Entity detaches all mayor functions  (optional) */
   virtual ErrorMessage suspend() {};
-  /** @brief rewinds to the beginning/last checkpoint */
+  /** rewinds to the beginning/last checkpoint */
   virtual ErrorMessage rewind() {};
-  /** @brief leaves the Entity. Ends it */
+  /** leaves the Entity. Ends it */
   virtual ErrorMessage preStop() {};
-  /** @brief Stops the entity. */
+  /**  Stops the entity. */
   virtual ErrorMessage stop() = 0;
 
-  // KILLING
-  /** @brief kills the Entity. should also calls prestop stop */
-  virtual ErrorMessage destroy() {};
 
-  void setStoryID(int storyID);
-  int getStoryID();
+  /** sets the story id of the current entity, this enables it to be identified in a global context.  @param storyID the story id */
+  inline void setStoryID(int storyID) { this->storyID = storyID; }
+  /** sets the story id of the current entity, this enables it to be identified in a  global context. @returns  the story id  */
+  inline int getStoryID() { this->storyID = storyID; }
+  /**  sets the id of the next story entity: StoryEntities can choose their following entity themselfs.
+   * the entity id defined here  will be startet after this entity ends. this can be convenient if you
+   * want to have a non linear story with switches.
+   * @param nextStoryID the story id of the next StoryEntity   */
+  inline void setNextStoryID(int nextStoryID) { this->nextStoryID = nextStoryID; }
+  /**  gets the story id of the current entity @returns story id */
+  inline int getNextStoryID() { return this->nextStoryID; }
 
-  void setNextStoryID(int nextStoryID);
-  int getNextStoryID();
+
 
   protected: