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

Timestamp:

May 18, 2006, 3:52:44 PM (18 years ago)

Author:

rennerc

Message:

server creates client spaceships now

File:

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

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

@@ -27 +27 @@
 #include "shared_network_data.h"
 #include "converter.h"
+#include "message_manager.h"
 
 #include "playable.h"
@@ -212 +213 @@
   if ( this->isServer())
   {
-    if ( SharedNetworkData::getInstance()->getNewUniqueID() < 0 )
+    int res = this->executeCreateEntity( classID, SharedNetworkData::getInstance()->getNewUniqueID(), owner );
+    
+    if ( res < 0 )
     {
       PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
       return -1;
     }
-    return this->executeCreateEntity( classID, SharedNetworkData::getInstance()->getNewUniqueID(), owner );
+    
+    return res;
   }
   else
@@ -461 +465 @@
 bool NetworkGameManager::signalNewPlayer(int userId)
 {
-#if 0
-  if ( userId >= outBuffer.size() )
-    resizeBufferVector( userId );
-
   /* create new playable for Player*/
   PRINTF(0)("Request for creation: %i\n", userId);
@@ -470 +470 @@
   PRINTF(0)("Request for creation: userid: %i, uniqueid: %i\n", userId, uniqueId);
   this->sendYouAre(uniqueId, userId);
-#endif
 }
 
@@ -709 +708 @@
   if ( !isServer() )
     return;
-#if 0
-  if ( userID != 0 )
-  {
-    if ( !writeToClientBuffer( outBuffer[userID], (byte)NET_YOU_ARE_ENTITY ) )
-      return;
-
-    if ( !writeToClientBuffer( outBuffer[userID], uniqueID ) )
-      return;
-  }
-  else
-  {
-#endif
-    doYouAre(uniqueID);
-#if 0
-  }
-#endif
-
+  
+  byte buf[INTSIZE];
+  
+  Converter::intToByteArray( uniqueID, buf, INTSIZE );
+  
+  MessageManager::getInstance()->sendMessage( MSGID_YOU_ARE, buf, INTSIZE, RT_USER, userID, MP_HIGHBANDWIDTH);
 }
 
@@ -939 +927 @@
 }
 
+bool NetworkGameManager::youAreHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+{
+  assert( dataLength == INTSIZE );
+  int uniqueId;
+  
+  Converter::byteArrayToInt( data, &uniqueId );
+  
+  NetworkGameManager::getInstance()->doYouAre( uniqueId );
+}
+
 #if 0
 bool NetworkGameManager::writeToClientBuffer( clientBuffer & cb, byte b )