Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9564 in orxonox.OLD


Ignore:
Timestamp:
Jul 28, 2006, 2:04:40 PM (18 years ago)
Author:
patrick
Message:

nick name handling

Location:
branches/proxy/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/README.NETWORK

    r9548 r9564  
    1010UNSOLVED:
    1111=========
    12  - 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
    13  - actualy the whole message sending system won't work in this network topic. proxys have to relay messages to clients
    1412 - the clients cant get its ip in the handleHandshakes without throuwing sigseg
    1513 - 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.
    1614 - Permissions: Proxy Servers shouldn't be able to create new eneitites on the server
     15 - the nick name must be handled new
    1716
    1817
  • branches/proxy/src/lib/network/network_stream.cc

    r9553 r9564  
    659659                ProxyControl::getInstance()->signalNewClient( it->second.userId);
    660660
    661 
    662 //                 this->handleNewClient( it->second.userId );
    663 
    664 //                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
    665 //                 {
    666 //                   PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
    667 //                 }
     661#warning dont know if this works: nick name handling
     662                if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
     663                {
     664                  PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
     665                }
    668666              }
    669667
  • branches/proxy/src/lib/network/player_stats.cc

    r9559 r9564  
    106106    this->oldNickName = nickName;
    107107  }
     108
     109  if ( std::find( id.begin(), id.end(), preferedTeamId_handle) != id.end() )
     110  {
     111    PRINTF(0)("user %s has changed team to %i\n", nickName.c_str(), this->teamId);
     112    this->oldNickName = nickName;
     113  }
    108114}
    109115
  • branches/proxy/src/util/multiplayer_team_deathmatch.cc

    r9504 r9564  
    138138  if ( currentGameState == GAMESTATE_PRE_GAME || currentGameState == GAMESTATE_GAME )
    139139  {
    140     if ( PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )
    141          && box == NULL
    142          &&  (PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM
    143          || bShowTeamChange )
     140    if ( PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() > NET_UNASSIGNED ) &&
     141         box == NULL &&
     142         (PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM || bShowTeamChange )
    144143
    145144       )
Note: See TracChangeset for help on using the changeset viewer.