Changeset 8589 in orxonox.OLD for branches

Timestamp:

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

Author:

rennerc

Message:

chat works now

Location:

branches/network/src

Files:

• lib/network/message_manager.cc (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (3 diffs)
• lib/shell/some_shell_commands.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.h (modified) (2 diffs)
• util/network_game_rules.cc (modified) (2 diffs)
• util/network_game_rules.h (modified) (1 diff)

branches/network/src/lib/network/message_manager.cc

@@ -319 +319 @@
     {
       NetworkMessage msg;
-      
+
       msg.data = new byte[dataLength];
       memcpy( msg.data, data, dataLength );
@@ -326 +326 @@
       msg.number = newNumber++;
       msg.priority = messagePriority;
-      
+
       it->second.messages.push_back( msg );
       
-      if ( recieverType == RT_ALL_ME )
-        incomingMessabeBuffer.push_back( msg );
-    }
-  }
-}
-
-
+     
+    }
+  }
+  
+  if ( recieverType == RT_ALL_ME )
+  {
+    NetworkMessage msg;
+
+    msg.data = new byte[dataLength];
+    memcpy( msg.data, data, dataLength );
+    msg.length = dataLength;
+    msg.messageId = messageId;
+    msg.number = newNumber++;
+    msg.priority = messagePriority;
+
+    incomingMessabeBuffer.push_back( msg );
+  }
+}
+
+

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;

branches/network/src/lib/shell/some_shell_commands.cc

@@ -28 +28 @@
 using namespace OrxShell;
 
+#include "network_game_rules.h"
+  SHELL_COMMAND(say, NetworkGameRules, shellSay)->setAlias("say");
+
 #include "player_stats.h"
   SHELL_COMMAND(nick, PlayerStats, shellNick)->setAlias("nick");

branches/network/src/util/multiplayer_team_deathmatch.h

@@ -12 +12 @@
 #include "network_game_rules.h"
 
-#include "glgui_box.h"
+#include "glgui.h"
 
 class TiXmlElement;
@@ -81 +81 @@
 
     OrxGui::GLGuiBox* box;
-
-
+    
     void calculateTeamScore();
     void nextGameState();

branches/network/src/util/network_game_rules.cc

@@ -17 +17 @@
 
 #include "network_game_rules.h"
+
+#include "network_game_manager.h"
 
 using namespace std;
@@ -53 +55 @@
 }
 
+
+void NetworkGameRules::shellSay( const std::string & message )
+{
+  NetworkGameManager::getInstance()->sendChatMessage( message, 0 );
+}
+
+

branches/network/src/util/network_game_rules.h

@@ -27 +27 @@
     
     virtual void handleChatMessage( int userId, const std::string & message, int messageType ) = 0;
+    
+    void shellSay( const std::string & message );