Changeset 9406 in orxonox.OLD for trunk/src/story_entities/multi_player_world_data.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/story_entities/multi_player_world_data.cc (modified) (12 diffs)

trunk/src/story_entities/multi_player_world_data.cc

@@ -47 +47 @@
 #include "player_stats.h"
 
+#include "proxy/network_settings.h"
 
 #include "glmenu_imagescreen.h"
@@ -52 +53 @@
 
 
-using namespace std;
+
 
 
@@ -110 +111 @@
 {
   const TiXmlElement* element = NULL;
-  
-  if( NetworkManager::getInstance()->isGameServer() )
+
+  if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
   {
     /* load the spawning points */
@@ -128 +129 @@
         BaseObject* created = Factory::fabricate(element);
         if( created != NULL )
-          printf("Created a Spawning Point %s: %s\n", created->getClassName(), created->getName());
+          printf("Created a Spawning Point %s: %s\n", created->getClassCName(), created->getCName());
 
         element = element->NextSiblingElement();
@@ -147 +148 @@
     element = element->FirstChildElement();
 
-    if( NetworkManager::getInstance()->isGameServer() )
+    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
     {
       while( element != NULL)
@@ -154 +155 @@
         BaseObject* created = Factory::fabricate(element);
         if( created != NULL )
-          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassName(), created->getName(), created->getLeafClassID(), element->Value());
+          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID(), element->Value());
         else
           PRINTF(1)("NetworkWorld: could not create this entity\n");
@@ -185 +186 @@
 
           if( created != NULL )
-            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassName(), created->getName(), created->getLeafClassID(), element->Value());
+            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID(), element->Value());
           else
             PRINTF(1)("NetworkWorld: could not create this entity\n");
@@ -205 +206 @@
 
 
-    if( NetworkManager::getInstance()->isGameServer())
+    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
     {
       this->localPlayer = new Player();
@@ -280 +281 @@
   GameWorldData::loadScene(root);
 
+//   LoadParamXML(root, "NetworkSettings", NetworkSettings::getInstance(), NetworkSettings, loadNetworkSettings);
+
   // create server playable
-  if ( NetworkManager::getInstance()->isGameServer() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );
@@ -296 +299 @@
 ErrorMessage MultiPlayerWorldData::unloadScene()
 {
+  // delete the proxy settings
+  delete NetworkSettings::getInstance();
+
   /* call underlying function */
   return GameWorldData::unloadScene();
@@ -317 +323 @@
   {
     Playable* p = dynamic_cast<Playable*>(*entity);
-    PRINTF(0)("Got a playable, class: %s, name: %s, uid: %i\n", (*entity)->getClassName(), (*entity)->getName(), p->getUniqueID());
+    PRINTF(0)("Got a playable, class: %s, name: %s, uid: %i\n", (*entity)->getClassCName(), (*entity)->getCName(), p->getUniqueID());
   }
 
@@ -340 +346 @@
 
   PNode* cam = State::getCameraTargetNode();
-  PRINT(0)("Camera has target - class: %s, name: %s, uid: %i\n", cam->getClassName(), cam->getName(), cam->getUniqueID());
+  PRINT(0)("Camera has target - class: %s, name: %s, uid: %i\n", cam->getClassCName(), cam->getCName(), cam->getUniqueID());
 
   PRINT(0)("==================================================\n");