Changeset 6360 in orxonox.OLD

Timestamp:

Dec 30, 2005, 11:15:43 PM (18 years ago)

Author:

patrick

Message:

network: repear work on the world chaos. cleaned up campaing.cc btw

Location:

branches/network/src/story_entities

Files:

• campaign.cc (modified) (2 diffs)
• game_world.h (modified) (1 diff)
• single_player_world.cc (modified) (2 diffs)
• single_player_world.h (modified) (1 diff)

branches/network/src/story_entities/campaign.cc

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer:
 */
 
@@ -20 +19 @@
 
 #include "factory.h"
-#include "game_loader.h"
-#include "story_entity.h"
-
-#include "world.h"
-#include "camera.h"
-
 #include "load_param.h"
 

branches/network/src/story_entities/game_world.h

@@ -86 +86 @@
 
     /* state flags */
-    bool bQuitGameWorld;                    //!< quit only the current game and return to menu
+    bool bQuitWorld;                    //!< quit only the current game and return to menu
     bool bPause;                        //!< pause mode
 

branches/network/src/story_entities/single_player_world.cc

@@ -24 +24 @@
 #include "factory.h"
 
+#include "world_entity.h"
+#include "npcs/npc_test1.h"
 
 
@@ -29 +31 @@
 
 //! This creates a Factory to fabricate a SinglePlayerWorld
-CREATE_FACTORY(SinglePlayerSinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
+CREATE_FACTORY(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
 
 

branches/network/src/story_entities/single_player_world.h

@@ -31 +31 @@
     ErrorMessage postLoad();
 
+  private:
+    void constuctorInit(const char* name, int worldID);
 };