# HG changeset patch
# User yexo <yexo@openttd.org>
# Date 2009-04-26 20:01:14
# Node ID 41a10b636ec26608ebd539b105518b167685cd35
# Parent  0ee00214be1de6d491681b0179d598f16b8251eb

(svn r16176) -Fix: forbid joining AI companies via the 'move' and 'join' console commands.

diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -636,6 +636,11 @@ DEF_CONSOLE_CMD(ConJoinCompany)
 		return true;
 	}
 
+	if (company_id != COMPANY_SPECTATOR && GetCompany(company_id)->is_ai) {
+		IConsoleError("Cannot join AI company.");
+		return true;
+	}
+
 	/* Check if the company requires a password */
 	if (NetworkCompanyIsPassworded(company_id) && argc < 3) {
 		IConsolePrintF(CC_ERROR, "Company %d requires a password to join.", company_id + 1);
@@ -674,6 +679,11 @@ DEF_CONSOLE_CMD(ConMoveClient)
 		return true;
 	}
 
+	if (company_id != COMPANY_SPECTATOR && GetCompany(company_id)->is_ai) {
+		IConsoleError("You cannot move clients to AI companies.");
+		return true;
+	}
+
 	if (ci->client_id == CLIENT_ID_SERVER && _network_dedicated) {
 		IConsoleError("Silly boy, you cannot move the server!");
 		return true;
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -1235,6 +1235,8 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
 
 	/* Check if the company is valid */
 	if (!IsValidCompanyID(company_id) && company_id != COMPANY_SPECTATOR) return;
+	/* We don't allow moving to AI companies */
+	if (company_id != COMPANY_SPECTATOR && GetCompany(company_id)->is_ai) return;
 
 	/* Check if we require a password for this company */
 	if (company_id != COMPANY_SPECTATOR && !StrEmpty(_network_company_states[company_id].password)) {