Changeset 8588 in orxonox.OLD

Timestamp:

Jun 19, 2006, 6:46:49 PM (18 years ago)

Author:

rennerc

Message:

implemented chat functionality

Location:

branches/network/src

Files:

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

branches/network/src/lib/network/message_manager.h

@@ -31 +31 @@
   MSGID_DELETESYNCHRONIZEABLE,
   MSGID_PREFEREDTEAM,
-  MSGID_CHANGENICKNAME
+  MSGID_CHANGENICKNAME,
+  MSGID_CHATMESSAGE
 };
 

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

@@ -280 +280 @@
 
 
-
+bool NetworkGameManager::chatMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+{
+  assert( State::getGameRules() );
+  assert( State::getGameRules()->isA( CL_NETWORK_GAME_RULES ) );
+  
+  NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
+  
+  if ( dataLength < 2*INTSIZE )
+  {
+    PRINTF(2)("got too small chatmessage from client %d\n", userId);
+    
+    return true;
+  }
+  
+  int messageType = 0;
+  Converter::byteArrayToInt( data, &messageType );
+  std::string message;
+  Converter::byteArrayToString( data+INTSIZE, message, dataLength-INTSIZE );
+  
+  rules.handleChatMessage( userId, message, messageType );
+  
+  return true;
+}
+
+/**
+ * send chat message
+ * @param message message text
+ * @param messageType some int
+ * @param userId user to send message to -1 = ALL
+ */
+void NetworkGameManager::sendChatMessage( const std::string & message, int messageType, int userId )
+{
+  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 );
+  else
+    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, sizeof(buf), RT_USER, userId, MP_HIGHBANDWIDTH );
+  
+  delete [] buf;
+}
+
+
+

branches/network/src/lib/network/network_game_manager.h

@@ -64 +64 @@
     
     void tick( float ds );
+    
+    void sendChatMessage( const std::string & message, int messageType, int userId = -1 );
 
   private:
@@ -70 +72 @@
     static bool delSynchronizeableHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
     static bool preferedTeamHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
+    static bool chatMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
     
     void setPreferedTeam( int userId, int teamId );

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -548 +548 @@
 
 
-
-
-
+/**
+ * this method is called by NetworkGameManger when he recieved a chat message
+ * @param userId senders user id
+ * @param message message string
+ * @param messageType some int
+ */
+void MultiplayerTeamDeathmatch::handleChatMessage( int userId, const std::string & message, int messageType )
+{
+  std::string name = "unknown";
+  
+  if ( PlayerStats::getStats( userId ) )
+  {
+    name = PlayerStats::getStats( userId )->getNickName();
+  }
+  
+  PRINTF(0)("CHATMESSAGE %s: %s\n", name.c_str(), message.c_str() );
+}
+
+
+
+

branches/network/src/util/multiplayer_team_deathmatch.h

@@ -57 +57 @@
     
     virtual void process(const Event &event);
+    
+    virtual void handleChatMessage( int userId, const std::string & message, int messageType );
 
   protected:

branches/network/src/util/network_game_rules.h

@@ -25 +25 @@
     
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }
+    
+    virtual void handleChatMessage( int userId, const std::string & message, int messageType ) = 0;