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

Timestamp:

Dec 7, 2005, 4:16:51 PM (19 years ago)

Author:

patrick

Message:

network: merged the trunk into the network with the command svn merge -r5824:HEAD ../trunk network, changes changed… bla bla..

Location:

branches/network/src/util

Files:

• loading/factory.h (modified) (1 diff)
• loading/resource_manager.cc (modified) (1 diff)
• object_manager.cc (modified) (1 diff)
• track/track_manager.cc (modified) (1 diff)

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

@@ -25 +25 @@
 class BaseObject;
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "base_object.h"
 #include "debug.h"

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

@@ -33 +33 @@
 #endif /* NO_TEXT */
 #ifndef NO_AUDIO
-#include "sound_engine.h"
+#include "sound_buffer.h"
 #include "ogg_player.h"
 #endif /* NO_AUDIO */

branches/network/src/util/object_manager.cc

@@ -62 +62 @@
     list<BaseObject*>::const_iterator node;
     for (node = objectList->begin(); node != objectList->end(); node++)
-    {
-      printf("1:::%s\n", (*node)->getName());
       if ((dynamic_cast<PNode*>(*node)->getAbsCoor() - center.getAbsCoor()).len() < radius)
-      {
         newList->push_back(dynamic_cast<WorldEntity*>(*node));
-        printf("%s\n",(*node)->getName());
-      }
-    }
     return newList;
   }

branches/network/src/util/track/track_manager.cc

@@ -28 +28 @@
 
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "substring.h"