Changeset 6665 in orxonox.OLD for branches/network/src/lib/network/network_game_manager.cc

Timestamp:

Jan 24, 2006, 1:36:11 PM (18 years ago)

Author:

patrick

Message:

network: changed network signal namings and added a new one

File:

• branches/network/src/lib/network/network_game_manager.cc (modified) (16 diffs)

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

@@ -84 +84 @@
     if ( isServer() )
     {
-      if ( b == REQUEST_CREATE )
+      if ( b == NET_REQUEST_CREATE )
       {
         if ( !handleRequestCreate( i, data, length, sender ) )
@@ -90 +90 @@
         continue;
       }
-      if ( b == REQUEST_REMOVE )
+      if ( b == NET_REQUEST_REMOVE )
       {
         if ( !handleRequestRemove( i, data, length, sender ) )
@@ -99 +99 @@
     else
     {
-      if ( b == CREATE_ENTITY )
+      if ( b == NET_CREATE_ENTITY )
       {
         PRINTF(0)("CREATE_ENTITY\n");
@@ -106 +106 @@
         continue;
       }
-      if ( b == REMOVE_ENTITY )
+      if ( b == NET_REMOVE_ENTITY )
       {
         if ( !handleRemoveEntity( i, data, length, sender ) )
@@ -112 +112 @@
         continue;
       }
-      if ( b == CREATE_ENTITY_LIST )
+      if ( b == NET_CREATE_ENTITY_LIST )
       {
         if ( !handleCreateEntityList( i, data, length, sender ) )
@@ -118 +118 @@
         continue;
       }
-      if ( b == REMOVE_ENTITY_LIST )
+      if ( b == NET_REMOVE_ENTITY_LIST )
       {
         if ( !handleRemoveEntityList( i, data, length, sender ) )
@@ -124 +124 @@
         continue;
       }
-      if ( b == YOU_ARE_ENTITY )
+      if ( b == NET_YOU_ARE_ENTITY )
       {
         if ( !handleYouAreEntity( i, data, length, sender ) )
@@ -132 +132 @@
     }
 
-    if ( b == REQUEST_ENTITY_LIST )
+    if ( b == NET_REQUEST_ENTITY_LIST )
     {
       sendEntityList( sender );
@@ -138 +138 @@
     }
 
-    if ( b == REQUEST_SYNC )
+    if ( b == NET_REQUEST_SYNC )
     {
       if ( !handleRequestSync( i, data, length, sender ) )
@@ -261 +261 @@
   }
   else
+
   {
     PRINTF(1)("This node is not a server and cannot create id %x\n", element->Value());
@@ -298 +299 @@
       continue;
 
-    if ( !writeToClientBuffer( outBuffer[i], (byte)REQUEST_CREATE ) )
+    if ( !writeToClientBuffer( outBuffer[i], (byte)NET_REQUEST_CREATE ) )
       return;
     if ( !writeToClientBuffer( outBuffer[i], (int)classID ) )
@@ -316 +317 @@
       continue;
 
-    if ( !writeToClientBuffer( outBuffer[i], (byte)REQUEST_REMOVE ) )
+    if ( !writeToClientBuffer( outBuffer[i], (byte)NET_REQUEST_REMOVE ) )
       return;
     if ( !writeToClientBuffer( outBuffer[i], uniqueID ) )
@@ -335 +336 @@
       continue;
 
-    if ( !writeToClientBuffer( outBuffer[i], (byte)CREATE_ENTITY ) )
+    if ( !writeToClientBuffer( outBuffer[i], (byte)NET_CREATE_ENTITY ) )
       return -1;
     if ( !writeToClientBuffer( outBuffer[i], (int)classID ) )
@@ -362 +363 @@
       continue;
 
-    if ( !writeToClientBuffer( outBuffer[i], (byte)REMOVE_ENTITY ) )
+    if ( !writeToClientBuffer( outBuffer[i], (byte)NET_REMOVE_ENTITY ) )
       return;
     if ( !writeToClientBuffer( outBuffer[i], uniqueID ) )
@@ -397 +398 @@
   e = this->networkStream->getSyncEnd();
 
-  if ( !writeToClientBuffer( outBuffer[userID], (byte)CREATE_ENTITY_LIST ) )
+  if ( !writeToClientBuffer( outBuffer[userID], (byte)NET_CREATE_ENTITY_LIST ) )
     return;
 
@@ -485 +486 @@
     s->setUniqueID( uniqueID );
     s->setOwner( owner );
+    s->setSynchronized(true);
     //this->networkStream->connectSynchronizeable( *s );
     if ( !isServer() )