Changeset 7368 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Apr 25, 2006, 11:37:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some renamings, and GameWorldData now has lists for what EntityLists should be drawed/ticked/collided(not yet implemented).

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (3 diffs)
• game_world.h (modified) (1 diff)
• game_world_data.h (modified) (4 diffs)

trunk/src/story_entities/game_world.cc

@@ -23 +23 @@
 #include "state.h"
 #include "class_list.h"
-#include "substring.h"
 
 #include "util/loading/game_loader.h"
 
-#include "p_node.h"
-#include "world_entity.h"
 #include "player.h"
 #include "camera.h"
@@ -35 +32 @@
 #include "test_entity.h"
 #include "terrain.h"
-#include "md2Model.h"
-#include "world_entities/projectiles/projectile.h"
-#include "npcs/npc_test1.h"
 #include "playable.h"
 
@@ -43 +37 @@
 
 #include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 #include "fast_factory.h"
-#include "util/loading/load_param.h"
 #include "shell_command.h"
 

trunk/src/story_entities/game_world.h

@@ -28 +28 @@
 class GameWorld : public StoryEntity
 {
-
   public:
     GameWorld ();

trunk/src/story_entities/game_world_data.h

@@ -10 +10 @@
 #include "data_tank.h"
 #include "error.h"
-
+#include "object_manager.h"
 
 class Camera;
@@ -16 +16 @@
 class Terrain;
 class WorldEntity;
-class ObjectManager;
 
 class GLMenuImageScreen;
@@ -32 +31 @@
 class GameWorldData : public DataTank
 {
-
   public:
     GameWorldData();
@@ -55 +53 @@
 
   public:
-    GLMenuImageScreen*  glmis;                       //!< The Level-Loader Display
+    GLMenuImageScreen*            glmis;          //!< The Level-Loader Display
 
-    Camera*             localCamera;                 //!< The current camera
-    Player*             localPlayer;                 //!< The player, you fly through the level.
-    WorldEntity*        sky;                         //!< The environmental sky of orxonox
-    Terrain*            terrain;                     //!< The terrain - ground
+    Camera*                       localCamera;    //!< The current camera
+    Player*                       localPlayer;    //!< The player, you fly through the level.
+    WorldEntity*                  sky;            //!< The environmental sky of orxonox
+    Terrain*                      terrain;        //!< The terrain - ground
 
-    OggPlayer*          music;                       //!< Reference to the SoundEngine's music player (OggPlayer)
-    ObjectManager*      objectManager;               //!< Reference to the objects manager
+    OggPlayer*                    music;          //!< Reference to the SoundEngine's music player (OggPlayer)
+    ObjectManager*                objectManager;  //!< Reference to the objects manager
 
-    GameRules*          gameRule;                   //!< Reference to the game rules of this game
+    GameRules*                    gameRule;       //!< Reference to the game rules of this game
+
+    std::list<OM_LIST>            tickLists;      //!< The Lists in the GameWorld that should be ticked.
+    std::list<OM_LIST>            drawLists;      //!< The Lists in the GameWorld, that should be drawn.
 };