Changeset 5996 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Dec 9, 2005, 12:31:01 PM (18 years ago)

Author:

patrick

Message:

orxonox/trunk: merged network branche into trunk with command svn merge -r 5824:HEAD

File:

• trunk/src/story_entities/world.cc (modified) (3 diffs)

trunk/src/story_entities/world.cc

@@ -71 +71 @@
 
 #include "playable.h"
+#include "network_manager.h"
+#include "playable.h"
+
 
 SHELL_COMMAND(speed, World, setSpeed);
@@ -317 +320 @@
       while( element != NULL)
         {
-          BaseObject* created = (Factory::fabricate(element));
+          BaseObject* created = Factory::fabricate(element);
           if( created != NULL )
           {
             if(created->isA(CL_WORLD_ENTITY))
               this->spawn(dynamic_cast<WorldEntity*>(created));
-            PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
+            printf("Created a %s: %s\n", created->getClassName(), created->getName());
           }
 
@@ -659 +662 @@
   // Get remote input
   // Update synchronizables
+/*  NetworkManager::getInstance()->synchronize();*/
 }