Changeset 6096 in orxonox.OLD for branches/network/src/util

Timestamp:

Dec 14, 2005, 2:12:30 AM (19 years ago)

Author:

patrick

Message:

network: server/client mode loading

Location:

branches/network/src/util/loading

Files:

• game_loader.cc (modified) (3 diffs)
• game_loader.h (modified) (2 diffs)

branches/network/src/util/loading/game_loader.cc

@@ -122 +122 @@
  * this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
  */
-ErrorMessage GameLoader::loadNetworkCampaign(const char* fileName, int nodeState)
+ErrorMessage GameLoader::loadNetworkCampaign(const char* fileName)
 {
   ErrorMessage errorCode;
@@ -128 +128 @@
   if (campaignName)
   {
-    this->currentCampaign = this->fileToNetworkCampaign(campaignName, nodeState);
+    this->currentCampaign = this->fileToNetworkCampaign(campaignName);
     delete[] campaignName;
   }
@@ -296 +296 @@
  *  this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
  */
-Campaign* GameLoader::fileToNetworkCampaign(const char* fileName, int nodeState)
+Campaign* GameLoader::fileToNetworkCampaign(const char* fileName)
 {
   /* do not entirely load the campaign. just the current world

branches/network/src/util/loading/game_loader.h

@@ -55 +55 @@
   ErrorMessage loadCampaign(const char* name);
   ErrorMessage loadDebugCampaign(Uint32 campaignID);
-  ErrorMessage loadNetworkCampaign(const char* fileName, int nodeState);
+  ErrorMessage loadNetworkCampaign(const char* fileName);
 
   void nextLevel();
@@ -67 +67 @@
 
   Campaign* fileToCampaign(const char* name);
-  Campaign* fileToNetworkCampaign(const char* fileName, int nodeState);
+  Campaign* fileToNetworkCampaign(const char* fileName);