cpp/openttd-patchpack/source Changeset - r17313:722abf9129a8

Changeset - r17313:722abf9129a8

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 13 years ago 2011-02-11 22:10:10
rubidium@openttd.org

(svn r22063) -Change: make the "has network" check also check whether the client is actually fully connected

3 files changed with 13 insertions and 1 deletions:

src/console_cmds.cpp

src/network/network_client.cpp

src/network/network_client.h

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -19,6 +19,7 @@ @@
 #include "network/network_func.h"
 #include "network/network_base.h"
 #include "network/network_admin.h"
 #include "network/network_client.h"
 #include "command_func.h"
 #include "settings_func.h"
 #include "fios.h"
@@ @@ -90,7 +91,7 @@ DEF_CONSOLE_HOOK(ConHookNeedNetwork) @@
+{
 	if (!NetworkAvailable(echo)) return CHR_DISALLOW;
 	if (!_networking) {
+	if (!_networking || (!_network_server && !MyClient::IsConnected())) {
 		if (echo) IConsoleError("Not connected. This command is only available in multiplayer.");
 		return CHR_DISALLOW;
+	}

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -463,6 +463,15 @@ NetworkRecvStatus ClientNetworkGameSocke @@
 	return NETWORK_RECV_STATUS_OKAY;
+}
 /**
  * Check whether the client is actually connected (and in the game).
  * @return True when the client is connected.
  */
 bool ClientNetworkGameSocketHandler::IsConnected()
+{
 	return my_client != NULL && my_client->status == STATUS_ACTIVE;
+}
 /***********
  * Receiving functions

src/network/network_client.h

➞

Show inline comments

@@ @@ -100,6 +100,8 @@ public: @@
 	static NetworkRecvStatus SendRCon(const char *password, const char *command);
 	static NetworkRecvStatus SendMove(CompanyID company, const char *password);
 	static bool IsConnected();
 	static void Send();
 	static bool Receive();
 	static bool GameLoop();

0 comments (0 inline, 0 general)