Changeset 6096 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

network: server/client mode loading

Location:

branches/network/src

Files:

• lib/network/network_manager.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• story_entities/campaign.cc (modified) (1 diff)
• story_entities/network_world.cc (modified) (2 diffs)
• util/loading/game_loader.cc (modified) (3 diffs)
• util/loading/game_loader.h (modified) (2 diffs)

branches/network/src/lib/network/network_manager.cc

@@ -50 +50 @@
   this->tmpStream = NULL;
   this->hostID = -1;
+  this->bGameServer = false;
 
   PRINTF(0)("NetworkManager created\n");

branches/network/src/orxonox.cc

@@ -353 +353 @@
   this->gameLoader = GameLoader::getInstance();
 
-  if( this->serverName != NULL)
-    this->gameLoader->loadNetworkCampaign("worlds/DefaultCampaign.oxc", NET_CLIENT);    /* start as client */
-  else if( this->port != -1)
-    this->gameLoader->loadNetworkCampaign("worlds/DefaultCampaign.oxc", NET_SERVER);    /* start as server */
+  if( this->port != -1)
+    this->gameLoader->loadNetworkCampaign("worlds/DefaultNetworkCampaign.oxc");
   else
     this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");                       /* start orxonox in single player mode */

branches/network/src/story_entities/campaign.cc

@@ -150 +150 @@
       delete (*it);
     }
+    PRINTF(1)("There is no StoryEnity left to play, quitting\n");
 }
 

branches/network/src/story_entities/network_world.cc

@@ -75 +75 @@
 
 
-//SHELL_COMMAND(speed, NetworkWorld, setSpeed);
-//SHELL_COMMAND(togglePNodeVisibility, NetworkWorld, togglePNodeVisibility);
-//SHELL_COMMAND(toggleBVVisibility, NetworkWorld, toggleBVVisibility);
+SHELL_COMMAND(speed, NetworkWorld, setSpeed);
+SHELL_COMMAND(togglePNodeVisibility, NetworkWorld, togglePNodeVisibility);
+SHELL_COMMAND(toggleBVVisibility, NetworkWorld, toggleBVVisibility);
 
 using namespace std;
 
 //! This creates a Factory to fabricate a NetworkWorld
-//CREATE_FACTORY(NetworkWorld, CL_WORLD);
+CREATE_FACTORY(NetworkWorld, CL_WORLD);
 
 NetworkWorld::NetworkWorld(const TiXmlElement* root)
@@ -341 +341 @@
   // find WorldEntities //
   ////////////////////////
-  if( NetworkManager::getInstance()->isGameServer())
+  if( /*NetworkManager::getInstance()->isGameServer()*/1)
   {
     element = root->FirstChildElement("WorldEntities");

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);