Changeset 6116 in orxonox.OLD for branches/network/src/lib/network/handshake.cc

Timestamp:

Dec 14, 2005, 11:19:11 PM (18 years ago)

Author:

rennerc

Message:

renamed EntityManager to NetworkGameManager

File:

• branches/network/src/lib/network/handshake.cc (modified) (4 diffs)

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

@@ -22 +22 @@
 #include "handshake.h"
 
-Handshake::Handshake( bool server, int clientId, int entityManagerId )
+Handshake::Handshake( bool server, int clientId, int networkGameManagerId )
 {
   /* set the class id for the base object */
   this->setClassID(CL_HANDSHAKE, "Handshake");
 
-  if ( clientId > 255 )
-  {
-    PRINTF(1)("clientId is too big for type byte (%d)! connection to client %d will not work!", clientId, clientId);
-  }
-
-  if ( entityManagerId > 255 )
-  {
-    PRINTF(1)("entityManagerId is too big for type byte (%d)! connection to client %d will not work!", entityManagerId, clientId);
-  }
-
   this->setIsServer(server);
   this->clientId = clientId;
-  this->entityManagerId = entityManagerId;
+  this->networkGameManagerId = networkGameManagerId;
   this->state = 0;
   this->isOk = false;
@@ -110 +100 @@
     this->isOk = true;
     this->newHostId = data[0];
-    this->newEntityManagerId = data[1];
+    this->newNetworkGameManagerId = data[1];
 
     if ( newHostId == 0 )
@@ -120 +110 @@
     else
     {
-      PRINTF(0)("got my hostID: %d\n", newHostId);
+      PRINTF(0)("got my hostID: %d and networkGameManagerId: %d\n", newHostId, newNetworkGameManagerId);
     }
     return;
@@ -189 +179 @@
       //memcpy(data, &clientId, 4);
       data[0] = (byte)clientId;
-      data[1] = (byte)entityManagerId;
+      data[1] = (byte)networkGameManagerId;
     }
     *reciever = clientId;