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

Timestamp:

Dec 17, 2005, 6:08:28 PM (19 years ago)

Author:

bensch

Message:

trunk: more world cleanup

Location:

trunk/src/story_entities

Files:

• world.cc (modified) (5 diffs)
• world.h (modified) (4 diffs)

trunk/src/story_entities/world.cc

@@ -28 +28 @@
 #include "camera.h"
 #include "environment.h"
+#include "terrain.h"
 
 #include "test_entity.h"
@@ -405 +406 @@
 ErrorMessage World::start()
 {
-  this->bQuitOrxonox = false;
-  this->bQuitCurrentGame = false;
+  this->bQuitWorld = false;
   this->mainLoop();
 }
@@ -418 +418 @@
 {
   PRINTF(3)("World::stop() - got stop signal\n");
-  this->bQuitCurrentGame = true;
+  this->bQuitWorld= true;
 }
 
@@ -669 +669 @@
   PRINTF(3)("World::mainLoop() - Entering main loop\n");
 
-  while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* @todo implement pause */
+  while(!this->bQuitWorld) /* @todo implement pause */
   {
     ++this->cycle;
@@ -676 +676 @@
       // Process input
     this->handleInput ();
-    if( this->bQuitCurrentGame || this->bQuitOrxonox)
+    if( this->bQuitWorld)
       break;
       // Process time

trunk/src/story_entities/world.h

@@ -7 +7 @@
 #define _WORLD_H
 
-#include "stdincl.h"
-#include "comincl.h"
+#include "sdlincl.h"
 #include "story_entity.h"
-#include "p_node.h"
 #include "object_manager.h"
-
 
 class WorldEntity;
@@ -52 +49 @@
   virtual void releaseLoadScreen();
 
-  /* command node functions */
-  bool command (Command* cmd);
-
   /* interface to world */
   void spawn (WorldEntity* entity);
@@ -84 +78 @@
     char* path;                         //!< The file from which this world is loaded
 
-    bool   showPNodes;                  //!< if the PNodes should be visible.
-    bool   showBV;                      //!< if the Bounding Volumes should be visible.
+    // FLAGS //
+    bool bQuitWorld;                    //!< quit only the current game and return to menu
+    bool bPause;                        //!< pause mode
 
+    bool showPNodes;                    //!< if the PNodes should be visible.
+    bool showBV;                        //!< if the Bounding Volumes should be visible.
+
+    // TIMING //
     Uint32 lastFrame;                   //!< last time of frame
     Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
@@ -93 +92 @@
     float speed;                        //!< how fast the game flows
     double gameTime;                    //!< this is where the game time is saved
-    bool bQuitOrxonox;                  //!< quit this application
-    bool bQuitCurrentGame;              //!< quit only the current game and return to menu
-    bool bPause;                        //!< pause mode
 
-    ObjectManager      objectManager;   //!< The ObjectManager of this World.
+    // INTERNAL ENGINES
+    ObjectManager objectManager;        //!< The ObjectManager of this World.
+    Shell*     shell;
+    OggPlayer* music;
 
     GLMenuImageScreen* glmis;           //!< The Level-Loader Display
 
-    Shell*     shell;
-    OggPlayer* music;
 
-  // IMPORTANT WORLD-ENTITIES
+    // IMPORTANT ENTITIES
     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 World.
-
-    Player* localPlayer;                //!< The Player, you fly through the level.
 };