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

1 files changed, 10 insertions, 0 deletions

diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index ac418c583..ced66db8b 100644
--- 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;