Changeset 9564 in orxonox.OLD for branches/proxy/src

Timestamp:

Jul 28, 2006, 2:04:40 PM (18 years ago)

Author:

patrick

Message:

nick name handling

Location:

branches/proxy/src

Files:

• lib/network/README.NETWORK (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/player_stats.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (1 diff)

branches/proxy/src/lib/network/README.NETWORK

@@ -10 +10 @@
 UNSOLVED:
 =========
- - what if the proxy server gets a new client and wants to add it to the game? There are some problems waiting in the network game manager
- - actualy the whole message sending system won't work in this network topic. proxys have to relay messages to clients
  - the clients cant get its ip in the handleHandshakes without throuwing sigseg
  - MessageManager: proxy/server forward the messages always. Perhaps there is a case, where messages get forwarded forever if there is a loop in the network. think about it again.
  - Permissions: Proxy Servers shouldn't be able to create new eneitites on the server
+ - the nick name must be handled new
 
 

branches/proxy/src/lib/network/network_stream.cc

@@ -659 +659 @@
                 ProxyControl::getInstance()->signalNewClient( it->second.userId);
 
-
-//                 this->handleNewClient( it->second.userId );
-
-//                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
-//                 {
-//                   PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
-//                 }
+#warning dont know if this works: nick name handling
+                if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
+                {
+                  PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
+                }
               }
 

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

@@ -106 +106 @@
     this->oldNickName = nickName;
   }
+
+  if ( std::find( id.begin(), id.end(), preferedTeamId_handle) != id.end() )
+  {
+    PRINTF(0)("user %s has changed team to %i\n", nickName.c_str(), this->teamId);
+    this->oldNickName = nickName;
+  }
 }
 

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -138 +138 @@
   if ( currentGameState == GAMESTATE_PRE_GAME || currentGameState == GAMESTATE_GAME )
   {
-    if ( PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )
-         && box == NULL
-         &&  (PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM
-         || bShowTeamChange )
+    if ( PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() > NET_UNASSIGNED ) &&
+         box == NULL &&
+         (PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM || bShowTeamChange )
 
        )