Changeset 6366 in orxonox.OLD for branches

Timestamp:

Dec 31, 2005, 1:13:27 PM (19 years ago)

Author:

patrick

Message:

network: inlined some functions

Location:

branches/network/src/story_entities

Files:

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

branches/network/src/story_entities/game_world.cc

@@ -454 +454 @@
   delete this->glmis;
 }
-
-
-/**
- *  this returns the current game time
- * @returns elapsed game time
-*/
-double GameWorld::getGameTime()
-{
-  return this->gameTime;
-}
-
 
 
@@ -695 +684 @@
 }
 
+/**
+ *  sets the track path of this world
+ * @param name the name of the path
+ */
 void GameWorld::setPath( const char* name)
 {
@@ -711 +704 @@
 }
 
-const char* GameWorld::getPath( void)
-{
-  return path;
-}

branches/network/src/story_entities/game_world.h

@@ -35 +35 @@
     void loadParams(const TiXmlElement* root);
 
-    double getGameTime();
 
     /* classes from story-entity */
@@ -55 +54 @@
     virtual void spawn (WorldEntity* entity);
 
-    /** @param speed sets the speed of the Game */
+
+    /**  this returns the current game time @returns elapsed game time     */
+    inline double getGameTime() { return this->gameTime; }
+    /** sets the game speed @param speed speed of the Game */
     inline void setSpeed(float speed) { this->speed = speed; };
-    const char* getPath();
+    /**  returns the track path of this world @returns the track path */
+    const char* getPath() {   return path; }
     void setPath( const char* name);
 
+    /** toggles the PNode visibility in the world (drawn as boxes) */
     void togglePNodeVisibility() { this->showPNodes = !this->showPNodes; };
+    /** toggles the bounding volume (BV) visibility */
     void toggleBVVisibility() { this->showBV = !this->showBV; };
 

branches/network/src/story_entities/multi_player_world.cc

@@ -23 +23 @@
 #include "fast_factory.h"
 #include "factory.h"
+
+
+#include "shell_command.h"
+#include "resource_manager.h"
+#include "state.h"
+
+#include "game_loader.h"
+#include "glmenu_imagescreen.h"
+
+#include "p_node.h"
+#include "world_entity.h"
+#include "player.h"
+#include "camera.h"
+#include "environment.h"
+#include "terrain.h"
+
+
 
 
@@ -92 +109 @@
 }
 
+
+
+
+/**
+ *  loads the GameWorld by initializing all resources, and set their default values.
+ */
+ErrorMessage MultiPlayerWorld::load()
+{}

branches/network/src/story_entities/multi_player_world.h

@@ -26 +26 @@
   void loadParams(const TiXmlElement* root);
 
+  virtual ErrorMessage load();
 
   private: