Changeset 6402 in orxonox.OLD for branches/network/src/story_entities/game_world.h

Timestamp:

Jan 3, 2006, 11:04:50 PM (20 years ago)

Author:

patrick

Message:

network: more modularity for the GameWorld: data and process are now totaly separated from each other, as it should be. Now I will do some magic on the MultiPlayerWorld, see if it works

File:

• branches/network/src/story_entities/game_world.h (modified) (2 diffs)

branches/network/src/story_entities/game_world.h

@@ -7 +7 @@
 #define _GAME_WORLD_H
 
-#include "sdlincl.h"
+
 #include "story_entity.h"
-#include "object_manager.h"
 
+
+class TiXmlElement;
+class Shell;
 class WorldEntity;
-class Camera;
-class Player;
-class GLMenuImageScreen;
-class Terrain;
-class TiXmlElement;
+class GameWorldData;
 
-class Shell;
-class OggPlayer;
-class GameWorldData;
 
 //! The game world
@@ -86 +81 @@
 
     /* world timing */
-    Uint32              lastFrame;                   //!< last time of frame
-    Uint32              cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
-    Uint32              dt;                          //!< time needed to calculate this frame (in milliSeconds)
-    float               dtS;                         //!< The time needed for caluculations in seconds
-    float               speed;                       //!< how fast the game flows
-    double              gameTime;                    //!< this is where the game time is saved
-
-    /* external modules interfaces */
-    ObjectManager objectManager;                     //!< The ObjectManager of this GameWorld.
+    Uint32              lastFrame;                    //!< last time of frame
+    Uint32              cycle;                        //!< The cycle we are in (starts with 0 and rises with every frame)
+    Uint32              dt;                           //!< time needed to calculate this frame (in milliSeconds)
+    float               dtS;                          //!< The time needed for caluculations in seconds
+    float               speed;                        //!< how fast the game flows
+    double              gameTime;                     //!< this is where the game time is saved
 
     /* external modules interfaces */
     Shell*              shell;
-    OggPlayer*          music;
-
-    /* important entities */
-};
-
-
-class GameWorldData : public BaseObject
-{
-
-  public:
-    GameWorldData();
-    ~GameWorldData();
-    /* world loading functions */
-    virtual ErrorMessage loadData(TiXmlElement* root);
-
-    virtual ErrorMessage loadGUI(TiXmlElement* root);
-    virtual ErrorMessage loadWorldEntities(TiXmlElement* root);
-    virtual ErrorMessage loadScene(TiXmlElement* root);
-
-  public:
-    GLMenuImageScreen*  glmis;                        //!< The Level-Loader Display
-
-    Camera*             localCamera;                 //!< The current Camera
-    Player*             localPlayer;                 //!< The Player, you fly through the level.
-    WorldEntity*        sky;                         //!< The Environmental Heaven of orxonox @todo insert this to environment insted
-    Terrain*            terrain;                     //!< The Terrain of the GameWorld.
-
 };