Changeset 6917 in orxonox.OLD

Timestamp:

Jan 31, 2006, 10:09:45 PM (19 years ago)

Author:

patrick

Message:

network: removed some library dependencies

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (2 diffs)
• network_stream.cc (modified) (4 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -30 +30 @@
 #include "playable.h"
 #include "player.h"
-#include "network_manager.h"
+#include "shared_network_data.h"
 
 #include "class_list.h"
@@ -541 +541 @@
     if ( b->isA(CL_WORLD_ENTITY) && !b->isA(CL_PLAYABLE) )
     {
-      if ( NetworkManager::getInstance()->getHostID()!=0 )
+      if ( SharedNetworkData::getInstance()->getHostID()!=0 )
       {
         static Vector pos = Vector(1000.0, 1000.0, 1000.0);

branches/network/src/lib/network/network_stream.cc

@@ -26 +26 @@
 #include "connection_monitor.h"
 #include "synchronizeable.h"
-#include "network_manager.h"
 #include "network_game_manager.h"
+#include "shared_network_data.h"
 
 #include "debug.h"
@@ -195 +195 @@
           {
             SharedNetworkData::getInstance()->setHostID( handshakes[i]->getHostId() );
-            myHostId = NetworkManager::getInstance()->getHostID();
+            myHostId = SharedNetworkData::getInstance()->getHostID();
 
             this->networkGameManager = NetworkGameManager::getInstance();
@@ -232 +232 @@
   Header header;
   int counter;
-  
+
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
     counter = 0;
-    
+
     if ( (*it)!=NULL && (*it)->beSynchronized() /*&& (*it)->getOwner() == myHostId*/ )
     {
       do {
         counter++;
-        
+
         //check for endless loop
         if ( counter > 50 )
@@ -248 +248 @@
           assert(false);
         }
-        
+
         reciever = 0;
         dataLength = (*it)->readBytes(downBuffer, DATA_STREAM_BUFFER_SIZE, &reciever);