Changeset 7954 in orxonox.OLD for trunk/src/lib/network/network_game_manager.cc

Timestamp:

May 29, 2006, 3:28:41 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

File:

• trunk/src/lib/network/network_game_manager.cc (modified) (34 diffs)

trunk/src/lib/network/network_game_manager.cc

@@ -27 +27 @@
 #include "shared_network_data.h"
 #include "converter.h"
+#include "message_manager.h"
 
 #include "playable.h"
@@ -52 +53 @@
   this->setClassID(CL_NETWORK_GAME_MANAGER, "NetworkGameManager");
 
-  hasRequestedWorld = false;
   this->setSynchronized(true);
+  
+  MessageManager::getInstance()->registerMessageHandler( MSGID_YOU_ARE, youAreHandler, NULL );
 }
 
@@ -61 +63 @@
 NetworkGameManager::~NetworkGameManager()
 {
+#if 0
   for ( int i = 0; i<outBuffer.size(); i++)
   {
@@ -66 +69 @@
       delete outBuffer[i].buffer;
   }
-
-}
-
-
+#endif
+
+}
+
+#if 0
 int NetworkGameManager::writeBytes(const byte* data, int length, int sender)
 {
@@ -141 +145 @@
     {
       sendEntityList( sender );
-      continue;
-    }
-    else if ( b == NET_REQUEST_SYNC )
-    {
-      if ( !handleRequestSync( i, data, length, sender ) )
-        return i;
       continue;
     }
@@ -160 +158 @@
   return i;
 }
-
+#endif
+
+#if 0
 int NetworkGameManager::readBytes(byte* data, int maxLength, int * reciever)
 {
@@ -192 +192 @@
   return 0;
 }
-
+#endif
+
+#if 0
 void NetworkGameManager::writeDebug() const
 {
@@ -200 +202 @@
 {
 }
+#endif
 
 
@@ -211 +214 @@
   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
   {
+#if 0
     this->requestCreateEntity( classID );
+#endif
     return -1;
   }
@@ -288 +296 @@
   else
   {
+#if 0
     this->requestRemoveEntity( uniqueID );
-  }
-}
-
-
-
+#endif
+  }
+}
+
+
+#if 0
 /*!
  * Creates the needed entity on the server if possible
@@ -311 +321 @@
   }
 }
-
+#endif
+
+#if 0
 /*!
  * Removes the specified entity on the server
@@ -329 +341 @@
   }
 }
+#endif
 
 /*!
@@ -337 +350 @@
 int NetworkGameManager::executeCreateEntity(ClassID classID, int uniqueID, int owner)
 {
+#if 0
   for ( int i = 0; i<outBuffer.size(); i++)
   {
@@ -351 +365 @@
       return -1;
   }
-
+#endif
   PRINTF(0)("ExecuteCreateEntity: server side: classID: %x, uniqueID: %i, owner: %i\n", classID, uniqueID, owner);
   doCreateEntity( classID, uniqueID, owner );
@@ -365 +379 @@
 void NetworkGameManager::executeRemoveEntity(int uniqueID)
 {
+#if 0
   for ( int i = 0; i<outBuffer.size(); i++)
   {
@@ -375 +390 @@
       return;
   }
+#endif
 
   doRemoveEntity(uniqueID);
@@ -388 +404 @@
 }
 
+#if 0
 /*!
  * Sends the Entities to the new connected client
@@ -443 +460 @@
   signalNewPlayer( userID );
 }
+#endif
 
 
@@ -448 +466 @@
 bool NetworkGameManager::signalNewPlayer(int userId)
 {
-  if ( userId >= outBuffer.size() )
-    resizeBufferVector( userId );
-
   /* create new playable for Player*/
   PRINTF(0)("Request for creation: %i\n", userId);
@@ -456 +471 @@
   PRINTF(0)("Request for creation: userid: %i, uniqueid: %i\n", userId, uniqueId);
   this->sendYouAre(uniqueId, userId);
-
 }
 
@@ -464 +478 @@
 {
   const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+  
+  if ( !playableList )
+    return false;
+  
   std::list<BaseObject*>::const_iterator it = playableList->begin();
 
@@ -478 +496 @@
 }
 
-
+#if 0
 /**
  * Creates a buffer for user n
@@ -498 +516 @@
   }
 }
+#endif
 
 /**
@@ -532 +551 @@
     s->setSynchronized(true);
     //this->networkStream->connectSynchronizeable( *s );
-    if ( !isServer() )
-      s->setIsOutOfSync( true );
+
     PRINTF(0)("Fabricated %s with id %d\n", s->getClassName(), s->getUniqueID());
 
@@ -601 +619 @@
 }
 
-/**
- * Tell the synchronizeable that a user's synchronizeable is out of sync
- * @param uniqueID: unique ID assigned with the entity which is out of sync
- * @param userID: user ID who's synchronizeable is out of sync
- */
-void NetworkGameManager::doRequestSync( int uniqueID, int userID )
-{
-  SynchronizeableList::const_iterator it,e;
-  it = this->networkStream->getSyncBegin();
-  e = this->networkStream->getSyncEnd();
-
-  while ( it != e )
-  {
-    if ( (*it)->getUniqueID() == uniqueID )
-    {
-      (*it)->requestSync( userID );
-      break;
-    }
-    it++;
-  }
-}
-
+#if 0
 /**
  * Copies length bytes to the clientBuffer with error checking
@@ -641 +638 @@
   return true;
 }
-
+#endif
+
+#if 0
 /**
  * Reads data from clientBuffer with error checking
@@ -660 +659 @@
   return true;
 }
+#endif
 
 /**
@@ -687 +687 @@
       } else
       {
-        PRINTF(1)("UniqueID is not a Playable\n");
+        PRINTF(1)("UniqueID %d is not a Playable\n", uniqueID);
       }
     }
@@ -697 +697 @@
   assert(player != NULL);
 
-  s->setIsOutOfSync( true );
-
   PRINTF(0)("uniqueID = %d\n", s->getUniqueID());
 
@@ -715 +713 @@
   if ( !isServer() )
     return;
-
-  if ( userID != 0 )
-  {
-    if ( !writeToClientBuffer( outBuffer[userID], (byte)NET_YOU_ARE_ENTITY ) )
-      return;
-
-    if ( !writeToClientBuffer( outBuffer[userID], uniqueID ) )
-      return;
-  }
-  else
-  {
-    doYouAre(uniqueID);
-  }
+  
+  byte buf[INTSIZE];
+  
+  Converter::intToByteArray( uniqueID, buf, INTSIZE );
+  
+  MessageManager::getInstance()->sendMessage( MSGID_YOU_ARE, buf, INTSIZE, RT_USER, userID, MP_HIGHBANDWIDTH);
 }
 
@@ -902 +893 @@
   return true;
 }
-
-bool NetworkGameManager::handleRequestSync( int & i, const byte * data, int length, int sender )
-{
-  if ( INTSIZE > length-i )
-  {
-    PRINTF(1)("Cannot read uniqueID from buffer! Not enough data left!\n");
-    return false;
-  }
-  int uniqueID;
-  i += Converter::byteArrayToInt( &data[i], &uniqueID );
-
-  PRINTF(0)("handleRequestSync %d %d\n", uniqueID, sender);
-  doRequestSync( uniqueID, sender );
-
-  return true;
-}
-
 
 /**
@@ -958 +932 @@
 }
 
-
+bool NetworkGameManager::youAreHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+{
+  assert( dataLength == INTSIZE );
+  int uniqueId;
+  
+  Converter::byteArrayToInt( data, &uniqueId );
+  
+  SynchronizeableList::const_iterator it = NetworkGameManager::getInstance()->networkStream->getSyncBegin();
+
+  Playable *p = NULL;
+  Synchronizeable *s = NULL;
+
+  for ( ; it !=NetworkGameManager::getInstance()->networkStream->getSyncEnd(); it++ )
+  {
+    if ( (*it)->getUniqueID()==uniqueId )
+    {
+      break;
+    }
+  }
+  
+  if ( it == NetworkGameManager::getInstance()->networkStream->getSyncEnd() )
+    return false;
+  
+  NetworkGameManager::getInstance()->doYouAre( uniqueId );
+  
+  return true;
+}
+
+#if 0
 bool NetworkGameManager::writeToClientBuffer( clientBuffer & cb, byte b )
 {
@@ -971 +973 @@
   return true;
 }
+
 
 bool NetworkGameManager::writeToClientBuffer( clientBuffer & cb, int i )
@@ -985 +988 @@
   return true;
 }
-
-void NetworkGameManager::sync( int uniqueID, int owner )
-{
-  /*if ( owner==this->getHostID() )
-  return;*/
-
-  if ( !isServer() )
-    executeRequestSync( uniqueID, 0 );
-  else
-    executeRequestSync( uniqueID, owner );
-}
-
-void NetworkGameManager::executeRequestSync( int uniqueID, int user )
-{
-  PRINTF(0)("executeRequestSync %d %d\n", uniqueID, user);
-  if ( user >= outBuffer.size() )
-    resizeBufferVector( user );
-
-  if ( !writeToClientBuffer( outBuffer[user], (byte)NET_REQUEST_SYNC ) )
-    return;
-  if ( !writeToClientBuffer( outBuffer[user], uniqueID ) )
-    return;
-}
-
+#endif
+
+