Changeset 6661 in orxonox.OLD for branches/network/src/lib

Timestamp:

Jan 23, 2006, 3:50:35 PM (18 years ago)

Author:

patrick

Message:

network: dont get the sync process to run again.

Location:

branches/network/src/lib/network

Files:

• handshake.cc (modified) (1 diff)
• network_game_manager.cc (modified) (2 diffs)
• network_stream.cc (modified) (4 diffs)

branches/network/src/lib/network/handshake.cc

@@ -34 +34 @@
   this->setOwner(0);
 
+  this->setSynchronized(true);
   PRINTF(5)("Handshake created clientId = %d\n", clientId);
 }

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

@@ -46 +46 @@
  */
 NetworkGameManager::NetworkGameManager()
+  : Synchronizeable()
 {
   PRINTF(0)("START\n");
@@ -55 +56 @@
 
   hasRequestedWorld = false;
+  this->setSynchronized(true);
 }
 

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

@@ -126 +126 @@
   // and one for handshake to reject client maxCon+1
   this->networkGameManager->setUniqueID( this->maxConnections + 2 );
-  this->connectSynchronizeable( *(this->networkGameManager) );
+  //this->connectSynchronizeable( *(this->networkGameManager) );
   this->setMaxConnections( 10 );
 }
@@ -199 +199 @@
             this->networkGameManager = NetworkGameManager::getInstance();
             this->networkGameManager->setUniqueID( handshakes[i]->getNetworkGameManagerId() );
-            this->connectSynchronizeable( *(this->networkGameManager) );
+            //this->connectSynchronizeable( *(this->networkGameManager) );
           }
           else
@@ -369 +369 @@
     PRINTF(0)("New Client: %d\n", clientId);
 
-    this->connectSynchronizeable(*handshakes[clientId]);
+    //this->connectSynchronizeable(*handshakes[clientId]);
   }
 
@@ -439 +439 @@
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
-    if( (*it)->beSynchronized() == true)
+    //if( (*it)->beSynchronized() == true)
       PRINT(0)("  Synchronizeable of class: %s::%s, with unique ID: %i, Synchronize: %i\n", (*it)->getClassName(), (*it)->getName(),
                (*it)->getUniqueID(), (*it)->beSynchronized());