Changeset 6356 in orxonox.OLD

Timestamp:

Dec 30, 2005, 10:10:10 PM (18 years ago)

Author:

patrick

Message:

network: the new world setup

File:

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

branches/network/src/story_entities/multi_player_world.h

@@ -1 +1 @@
 /*!
- * @file world.h
+ * @file multi_player_world.h
   *  Holds and manages all game data
 */
 
-#ifndef _WORLD_H
-#define _WORLD_H
+#ifndef _MULTI_PLAYER_WORLD_H
+#define _MULTI_PLAYER_WORLD_H
 
-#include "sdlincl.h"
-#include "story_entity.h"
-#include "object_manager.h"
+#include "game_world.h"
 
-class NetworkWorld;
 
 class WorldEntity;
@@ -23 +20 @@
 class OggPlayer;
 
-//! The game world
+//! The multiplayer game world
 /**
    this class initializes everything that should be displayed inside of the current level.
    it is the main driving factor during gameplay.
 */
-class NetworkWorld : public StoryEntity {
+class MultiPlayerWorld : public GameWorld {
 
  public:
-  NetworkWorld (const TiXmlElement* root = NULL);
-  virtual ~NetworkWorld ();
+  MultiPlayerWorld (const TiXmlElement* root = NULL);
+  virtual ~MultiPlayerWorld ();
 
   void loadParams(const TiXmlElement* root);
@@ -110 +107 @@
 
     WorldEntity* sky;                   //!< The Environmental Heaven of orxonox @todo insert this to environment insted
-    Terrain* terrain;                   //!< The Terrain of the NetworkWorld.
+    Terrain* terrain;                   //!< The Terrain of the MultiPlayerWorld.
 };
 
-#endif /* _WORLD_H */
+#endif /* _MULTI_PLAYER_WORLD_H */