Changeset 8623 in orxonox.OLD for trunk/src/lib/network/network_game_manager.h

Timestamp:

Jun 20, 2006, 1:39:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

• trunk/src/lib/network/network_game_manager.h (modified) (2 diffs)

trunk/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 );