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

Timestamp:

Jun 19, 2006, 8:36:11 PM (18 years ago)

Author:

rennerc

Message:

chat works now

File:

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

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

@@ -60 +60 @@
   MessageManager::getInstance()->registerMessageHandler( MSGID_DELETESYNCHRONIZEABLE, delSynchronizeableHandler, NULL );
   MessageManager::getInstance()->registerMessageHandler( MSGID_PREFEREDTEAM, preferedTeamHandler, NULL );
+  MessageManager::getInstance()->registerMessageHandler( MSGID_CHATMESSAGE, chatMessageHandler, NULL );
   
   this->gameState = 0;
@@ -300 +301 @@
   
   rules.handleChatMessage( userId, message, messageType );
-  
+
   return true;
 }
@@ -312 +313 @@
 void NetworkGameManager::sendChatMessage( const std::string & message, int messageType, int userId )
 {
-  byte * buf = new byte[message.length()]+2*INTSIZE;
-  
+  byte * buf = new byte[message.length()+2*INTSIZE];
+
   assert( Converter::intToByteArray( messageType, buf, INTSIZE ) == INTSIZE );
   assert( Converter::stringToByteArray(message, buf+INTSIZE, message.length()+INTSIZE) == message.length()+INTSIZE );
   
   if ( userId == -1 )
-    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, sizeof(buf), RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+2*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
   else
-    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, sizeof(buf), RT_USER, userId, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+2*INTSIZE, RT_USER, userId, MP_HIGHBANDWIDTH );
   
   delete [] buf;