Changeset 9600 in orxonox.OLD for branches/proxy/src/lib/network/proxy/proxy_control.cc

Timestamp:

Jul 29, 2006, 9:59:20 AM (18 years ago)

Author:

patrick

Message:

reconnection command deep structure

File:

• branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) (4 diffs)

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

@@ -16 +16 @@
 
 #include "class_list.h"
-
+#include "shell_command.h"
 
 #include "state.h"
 #include "shared_network_data.h"
+#include "network_manager.h"
 #include "network_game_manager.h"
 #include "ip.h"
@@ -35 +36 @@
 ProxyControl* ProxyControl::singletonRef = NULL;
 
+
+SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
 
 /**
@@ -227 +230 @@
 
 
+/**
+ * a shell command wrapper
+ * @param userId the userId of the client/user :D
+ * @param serverId the userId of the server to connect to
+ */
+void ProxyControl::forceReconnectionShell(int userId, int serverId)
+{
+  this->forceReconnection(userId, serverId);
+}
+
 
 /**
@@ -332 +345 @@
 
       // handle it
-      if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+      if( SharedNetworkData::getInstance()->getHostID() == userId &&
+         (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()))
       {
+        NetworkManager::getInstance()->reconnectToServer(IP(ipHost, 9999));
       }
       break;