cpp/openttd-patchpack/source Changeset - r11781:41a10b636ec2

Changeset - r11781:41a10b636ec2

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

yexo - 15 years ago 2009-04-26 20:01:14
yexo@openttd.org

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

2 files changed with 12 insertions and 0 deletions:

src/console_cmds.cpp

src/network/network_server.cpp

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -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;

src/network/network_server.cpp

➞

Show inline comments

@@ @@ -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)) {

0 comments (0 inline, 0 general)