Changeset 9537 in orxonox.OLD for branches/proxy/src/lib

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/lib/network

Files:

• Makefile.am (modified) (2 diffs)
• network_game_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (1 diff)
• proxy/proxy_control.cc (added)
• proxy/proxy_control.h (added)

branches/proxy/src/lib/network/Makefile.am

@@ -27 +27 @@
                       \
                       proxy/network_settings.cc \
+                      proxy/proxy_control.cc \
                       \
                       monitor/connection_monitor.cc \
@@ -76 +77 @@
                 udp_broadcast.h \
                 \
-                proxy/network_settings.cc \
+                proxy/network_settings.h \
+                proxy/proxy_control.h \
                 \
                 monitor/connection_monitor.h \

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

@@ -97 +97 @@
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
 
-  int team = rules.getTeamForNewUser();
-  ClassID playableClassId = rules.getPlayableClassId( userId, team );
-  std::string playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
-  std::string playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
-  float       playableScale = rules.getPlayableScale( userId, team, playableClassId );
+  int          team = rules.getTeamForNewUser();
+  ClassID      playableClassId = rules.getPlayableClassId( userId, team );
+  std::string  playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
+  std::string  playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
+  float        playableScale = rules.getPlayableScale( userId, team, playableClassId );
 
   BaseObject * bo = Factory::fabricate( playableClassId );

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

@@ -645 +645 @@
                 this->networkMonitor->addNode(&it->second);
 
-                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() );
-                }
+                // work with the ProxyControl to init the new client
+
+
+//                 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() );
+//                 }
               }