Changeset 6239 in orxonox.OLD for branches/network

Timestamp:

Dec 21, 2005, 3:29:38 PM (19 years ago)

Author:

patrick

Message:

network: singleton fix

Location:

branches/network/src

Files:

• lib/network/network_manager.cc (modified) (1 diff)
• story_entities/network_world.cc (modified) (2 diffs)
• util/loading/factory.cc (modified) (2 diffs)

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

@@ -35 +35 @@
 
 
-
-
+NetworkManager* NetworkManager::singletonRef = NULL;
 
 /**

branches/network/src/story_entities/network_world.cc

@@ -338 +338 @@
   // find WorldEntities //
   ////////////////////////
-  if( NetworkManager::getInstance()->isGameServer())
-  {}
-
   element = root->FirstChildElement("WorldEntities");
   if( element == NULL)
@@ -356 +353 @@
           || !strcmp( element->Value(), "SpaceShip"))
       {
+
         BaseObject* created = Factory::fabricate(element);
         if( created != NULL )

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

@@ -127 +127 @@
 }
 
+BaseObject* Factory::fabricate(ClassID classID)
+{
+  if (Factory::factoryList == NULL)
+    return NULL;
+
+  std::list<Factory*>::const_iterator factory;
+  for (factory = Factory::factoryList->begin(); factory != Factory::factoryList->end(); factory++)
+    if (*(*factory) == classID)
+      break;
+
+  if (factory != Factory::factoryList->end())
+  {
+    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getName());
+    return (*factory)->fabricateObject(NULL);
+  }
+  else
+  {
+    PRINTF(2)("Could not Fabricate an Object of ClassID '%h'\n", classID);
+    return NULL;
+  }
+}
+
 
 /**
@@ -160 +182 @@
  * @returns a new Object of Type classID on match, NULL otherwise
  */
-BaseObject* Factory::fabricate(ClassID classID)
-{
-  if (Factory::factoryList == NULL)
-    return NULL;
 
-  std::list<Factory*>::const_iterator factory;
-  for (factory = Factory::factoryList->begin(); factory != Factory::factoryList->end(); factory++)
-    if (*(*factory) == classID)
-      break;
-
-  if (factory != Factory::factoryList->end())
-  {
-    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getName());
-    return (*factory)->fabricateObject(NULL);
-  }
-  else
-  {
-    PRINTF(2)("Could not Fabricate an Object of ClassID '%h'\n", classID);
-    return NULL;
-  }
-}