Changeset 6659 in orxonox.OLD

Timestamp:

Jan 23, 2006, 3:15:07 PM (18 years ago)

Author:

patrick

Message:

network: the Synchronizeables now all get connected

Location:

branches/network/src/lib

Files:

• coord/p_node.cc (modified) (1 diff)
• network/network_manager.cc (modified) (1 diff)
• network/network_stream.cc (modified) (3 diffs)
• network/network_stream.h (modified) (1 diff)
• network/synchronizeable.cc (modified) (1 diff)
• network/synchronizeable.h (modified) (1 diff)

branches/network/src/lib/coord/p_node.cc

@@ -42 +42 @@
  */
 PNode::PNode (PNode* parent, long nodeFlags)
+  : Synchronizeable(), BaseObject()
 {
   this->setClassID(CL_PARENT_NODE, "PNode");

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

@@ -114 +114 @@
   this->bGameServer = true;
   this->defaultSyncStream = new NetworkStream(port);
+  this->defaultSyncStream->createNetworkGameManager();
   PRINTF(0)("CREATE SERVER\n");
   this->bGameServer = true;

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

@@ -81 +81 @@
   this->handshakes.push_back( NULL );
   this->bActive = true;
-  this->networkGameManager = NetworkGameManager::getInstance();
-  // setUniqueID( maxCon+2 ) because we need one id for every handshake
-  // and one for handshake to reject client maxCon+1
-  this->networkGameManager->setUniqueID( this->maxConnections + 2 );
-  this->connectSynchronizeable( *(this->networkGameManager) );
-
-  this->setMaxConnections( 10 );
 }
 
@@ -129 +122 @@
   delete connectionMonitor;
   delete networkProtocol;
+}
+
+
+void NetworkStream::createNetworkGameManager()
+{
+  this->networkGameManager = NetworkGameManager::getInstance();
+  // setUniqueID( maxCon+2 ) because we need one id for every handshake
+  // and one for handshake to reject client maxCon+1
+  this->networkGameManager->setUniqueID( this->maxConnections + 2 );
+  this->connectSynchronizeable( *(this->networkGameManager) );
+  this->setMaxConnections( 10 );
 }
 
@@ -425 +429 @@
   PRINT(0)(" Host ID: %i\n", this->myHostId);
 
-  PRINT(0)(" Connected Synchronizeables:\n");
+  PRINT(0)(" Got %i connected Synchronizeables:\n", this->synchronizeables.size());
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
-    PRINT(0)("  Synchronizeable of class: %s::%s, with unique ID: %i\n", (*it)->getClassName(), (*it)->getName(), (*it)->getUniqueID());
+    PRINT(0)("  Synchronizeable of class: %s::%s, with unique ID: %i, Synchronize: %i\n", (*it)->getClassName(), (*it)->getName(), (*it)->getUniqueID(), (*it)->beSynchronized());
   }
 

branches/network/src/lib/network/network_stream.h

@@ -39 +39 @@
     ~NetworkStream();
     void init();
+
+    void createNetworkGameManager();
 
     void connectSynchronizeable(Synchronizeable& sync);

branches/network/src/lib/network/synchronizeable.cc

@@ -43 +43 @@
 
   this->bSynchronize = false;
-  NetworkStream* nd;
-  if( this->isA(CL_NETWORK_GAME_MANAGER))
-  {
-    nd = NetworkGameManager::getInstance()->getNetworkStream();
-    assert(nd != NULL);
-    nd->connectSynchronizeable(*this);
-  }
+  NetworkStream* nd = NetworkManager::getInstance()->getDefaultSyncStream();
+  assert(nd != NULL);
+  nd->connectSynchronizeable(*this);
 }
 

branches/network/src/lib/network/synchronizeable.h

@@ -167 +167 @@
   public:
     Synchronizeable();
-    ~Synchronizeable();
+    virtual ~Synchronizeable();
 
     virtual int       writeBytes(const byte* data, int length, int sender);