Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9537 in orxonox.OLD


Ignore:
Timestamp:
Jul 27, 2006, 11:28:45 PM (18 years ago)
Author:
patrick
Message:

found the bug. there is need for another control center for proxies to signal new clients and leavings. This is a central part of the proxy synchronization process

Location:
branches/proxy/src
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/defs/class_id.h

    r9406 r9537  
    424424  CL_SIMPLE_SYNC                =    0x00000d0a,
    425425  CL_NETWORK_MONITOR            =    0x00000d0b,
     426  CL_PROXY_CONTROL              =    0x00000d0c,
    426427
    427428
  • branches/proxy/src/lib/network/Makefile.am

    r9494 r9537  
    2727                      \
    2828                      proxy/network_settings.cc \
     29                      proxy/proxy_control.cc \
    2930                      \
    3031                      monitor/connection_monitor.cc \
     
    7677                udp_broadcast.h \
    7778                \
    78                 proxy/network_settings.cc \
     79                proxy/network_settings.h \
     80                proxy/proxy_control.h \
    7981                \
    8082                monitor/connection_monitor.h \
  • branches/proxy/src/lib/network/network_game_manager.cc

    r9530 r9537  
    9797  NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
    9898
    99   int team = rules.getTeamForNewUser();
    100   ClassID playableClassId = rules.getPlayableClassId( userId, team );
    101   std::string playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
    102   std::string playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
    103   float       playableScale = rules.getPlayableScale( userId, team, playableClassId );
     99  int          team = rules.getTeamForNewUser();
     100  ClassID      playableClassId = rules.getPlayableClassId( userId, team );
     101  std::string  playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
     102  std::string  playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
     103  float        playableScale = rules.getPlayableScale( userId, team, playableClassId );
    104104
    105105  BaseObject * bo = Factory::fabricate( playableClassId );
  • branches/proxy/src/lib/network/network_stream.cc

    r9534 r9537  
    645645                this->networkMonitor->addNode(&it->second);
    646646
    647                 this->handleNewClient( it->second.userId );
    648 
    649                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
    650                 {
    651                   PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
    652                 }
     647                // work with the ProxyControl to init the new client
     648
     649
     650//                 this->handleNewClient( it->second.userId );
     651
     652//                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
     653//                 {
     654//                   PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
     655//                 }
    653656              }
    654657
  • branches/proxy/src/world_entities/player.cc

    r9536 r9537  
    3535  this->setClassID(CL_PLAYER, "Player");
    3636
    37   PRINTF(0)("PLAYER INIT\n");
     37  PRINTF(4)("PLAYER INIT\n");
    3838
    3939  this->playable = NULL;
Note: See TracChangeset for help on using the changeset viewer.