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

Timestamp:

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

Author:

patrick

Message:

network: major changes in the world files

File:

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

branches/network/src/story_entities/game_world.h

@@ -38 +38 @@
 
     /* classes from story-entity */
-    virtual ErrorMessage preLoad();
-    virtual ErrorMessage load ();
-    virtual ErrorMessage postLoad();
+    ErrorMessage preLoad();
+    ErrorMessage load ();
+    ErrorMessage postLoad();
 
     virtual ErrorMessage preStart();
@@ -92 +92 @@
     bool showBV;                        //!< if the Bounding Volumes should be visible.
 
+    GLMenuImageScreen* glmis;           //!< The Level-Loader Display
+
     /* world timing */
     Uint32 lastFrame;                   //!< last time of frame
@@ -103 +105 @@
     ObjectManager objectManager;        //!< The ObjectManager of this GameWorld.
 
+    /* external modules interfaces */
+    Shell*     shell;
+    OggPlayer* music;
 
     /* important entities */