Changeset 8643 in orxonox.OLD for branches/network/src

Timestamp:

Jun 20, 2006, 5:52:34 PM (18 years ago)

Author:

rennerc

Message:

chatting works now with right names

Location:

branches/network/src

Files:

• lib/network/message_manager.cc (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (6 diffs)
• lib/network/network_game_manager.h (modified) (1 diff)
• lib/network/player_stats.cc (modified) (2 diffs)
• lib/network/synchronizeable.cc (modified) (3 diffs)
• lib/network/synchronizeable.h (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/spectator.cc (modified) (2 diffs)

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

@@ -19 +19 @@
 
 #include "network_stream.h"
+#include "shared_network_data.h"
 
 using namespace std;
@@ -339 +340 @@
     msg.length = dataLength;
     msg.messageId = messageId;
-    msg.number = newNumber++;
+    msg.number = SharedNetworkData::getInstance()->getHostID();
     msg.priority = messagePriority;
 

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

@@ -112 +112 @@
   stats->setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
   stats->setSynchronized( true );
-  stats->setOwner( getHostID() );
+  stats->setOwner( SharedNetworkData::getInstance()->getHostID() );
   
   stats->setTeamId( team );
@@ -247 +247 @@
 {
   if ( isServer() )
-    setPreferedTeam( getHostID(), teamId );
+    setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
   else
   {
@@ -284 +284 @@
 bool NetworkGameManager::chatMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
+  PRINTF(0)("NetworkGameManager::chatMessageHandler %d %d\n", userId, SharedNetworkData::getInstance()->getHostID() );
+  if ( NetworkGameManager::getInstance()->isServer() && userId !=  SharedNetworkData::getInstance()->getHostID() )
+  {
+    MessageManager::getInstance()->sendMessage( messageId, data, dataLength, RT_ALL_NOT_ME, 0, MP_HIGHBANDWIDTH );
+  }
+  
   assert( State::getGameRules() );
   assert( State::getGameRules()->isA( CL_NETWORK_GAME_RULES ) );
@@ -289 +295 @@
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
   
-  if ( dataLength < 2*INTSIZE )
+  if ( dataLength < 3*INTSIZE )
   {
     PRINTF(2)("got too small chatmessage from client %d\n", userId);
@@ -298 +304 @@
   int messageType = 0;
   Converter::byteArrayToInt( data, &messageType );
+  int senderUserId = 0;
+  Converter::byteArrayToInt( data+INTSIZE, &senderUserId );
   std::string message;
-  Converter::byteArrayToString( data+INTSIZE, message, dataLength-INTSIZE );
-  
-  rules.handleChatMessage( userId, message, messageType );
+  Converter::byteArrayToString( data+2*INTSIZE, message, dataLength-2*INTSIZE );
+  
+  rules.handleChatMessage( senderUserId, message, messageType );
 
   return true;
@@ -310 +318 @@
  * @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];
+ */
+void NetworkGameManager::sendChatMessage( const std::string & message, int messageType )
+{
+  byte * buf = new byte[message.length()+3*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, message.length()+2*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
+  assert( Converter::intToByteArray( SharedNetworkData::getInstance()->getHostID(), buf+INTSIZE, INTSIZE ) == INTSIZE );
+  assert( Converter::stringToByteArray(message, buf+2*INTSIZE, message.length()+INTSIZE) == message.length()+INTSIZE );
+  
+  if ( this->isServer() )
+    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
   else
-    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+2*INTSIZE, RT_USER, userId, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_NOT_ME, 0, MP_HIGHBANDWIDTH );
+
   
   delete [] buf;

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

@@ -65 +65 @@
     void tick( float ds );
     
-    void sendChatMessage( const std::string & message, int messageType, int userId = -1 );
+    void sendChatMessage( const std::string & message, int messageType );
 
   private:

branches/network/src/lib/network/player_stats.cc

@@ -95 +95 @@
     this->setPlayableUniqueId( this->playableUniqueId );
     
-    PRINTF(0)("uniqueID changed %d %d %d\n", userId, getHostID(), getUniqueID());
+    PRINTF(0)("uniqueID changed %d %d %d\n", userId, SharedNetworkData::getInstance()->getHostID(), getUniqueID());
   }
   
@@ -155 +155 @@
   }
   
-  if ( this->playable && userId == getHostID() )
+  if ( this->playable && userId == SharedNetworkData::getInstance()->getHostID() )
   {
     State::getPlayer()->setPlayable( this->playable );

branches/network/src/lib/network/synchronizeable.cc

@@ -38 +38 @@
   this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
   this->owner = 0;
-  this->hostID = SharedNetworkData::getInstance()->getHostID();
-  this->setIsServer(this->hostID == 0);
+  this->setIsServer(SharedNetworkData::getInstance()->getHostID() == 0);
   this->uniqueID = NET_UID_UNASSIGNED;
   this->networkStream = NULL;
@@ -222 +221 @@
     hasPermission = (
             this->isServer() && (*it)->checkPermission( PERMISSION_SERVER ) ||
-            this->owner == this->hostID && (*it)->checkPermission( PERMISSION_OWNER ) ||
+        this->owner == SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) ||
             this->isServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) ||
             (*it)->checkPermission( PERMISSION_ALL ) 
@@ -345 +344 @@
         (*it)->checkPermission( PERMISSION_SERVER ) && networkStream->isUserServer( userId ) ||
         (*it)->checkPermission( PERMISSION_OWNER ) && this->owner == userId ||
-        networkStream->isUserServer( userId ) && this->owner != getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) ||
+        networkStream->isUserServer( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) ||
         (*it)->checkPermission( PERMISSION_ALL ) 
        )

branches/network/src/lib/network/synchronizeable.h

@@ -67 +67 @@
     inline void setUniqueID( int id ){ uniqueID = id; }
     inline int  getUniqueID() const { return uniqueID; }
-    inline int getHostID() { return this->hostID; }
 
     inline int getOwner(){ return owner; }
@@ -89 +88 @@
     int               mLeafClassId;   //!< store leafClassId to send via states
     int               owner;          //!< hostId of owner ( 0 if none / server )
-    int               hostID;         //!< my own host id
     bool              bSynchronize;   //!< do we need beeing synchronized?
 

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -87 +87 @@
   this->notifier->show();
   this->notifier->setAbsCoor2D(5, 30);
+  this->notifier->setFadeAge( 6.0 );
+  this->notifier->setHideAge( 8.0 );
   this->input = new OrxGui::GLGuiInputLine();
+  this->input->setAbsCoor2D(180, 5);
   this->input->connect(SIGNAL(input, enterPushed), this, SLOT(MultiplayerTeamDeathmatch, onInputEnter));
 }
@@ -597 +600 @@
   }
   
-  PRINTF(0)("CHATMESSAGE %s: %s\n", name.c_str(), message.c_str() );
+  PRINTF(0)("CHATMESSAGE %s (%d): %s\n", name.c_str(), userId, message.c_str() );
   notifier->pushNotifyMessage(name + ": " + message);
 }

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -33 +33 @@
 
 #include "network_game_manager.h"
+#include "shared_network_data.h"
 
 #include "power_ups/weapon_power_up.h"
@@ -326 +327 @@
   Playable::tick(time);
 
-  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
+  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == SharedNetworkData::getInstance()->getHostID() )
    {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;

branches/network/src/world_entities/spectator.cc

@@ -20 +20 @@
 #include "key_mapper.h"
 
+#include "shared_network_data.h"
 
 CREATE_FACTORY(Spectator, CL_SPECTATOR);
@@ -161 +162 @@
   Playable::tick( time );
   
-  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
+  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == SharedNetworkData::getInstance()->getHostID() )
   {
     xMouse *= time / 10;