mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-30 09:59:10 +00:00
Code Issues Activity

(svn r16634) -Codechange: use Company::IsHumanID() instead of IsHumanCompany()

Browse Source
This commit is contained in:
smatz
2009-06-23 12:11:35 +00:00
parent 192b9bda7b
commit 22cf8d8480
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/console_cmds.cpp
View File

@@ -666,7 +666,7 @@ DEF_CONSOLE_CMD(ConJoinCompany)
return true;
}
if (company_id != COMPANY_SPECTATOR && Company::Get(company_id)->is_ai) {
if (company_id != COMPANY_SPECTATOR && !Company::IsHumanID(company_id)) {
IConsoleError("Cannot join AI company.");
return true;
}
@@ -709,7 +709,7 @@ DEF_CONSOLE_CMD(ConMoveClient)
return true;
}
if (company_id != COMPANY_SPECTATOR && Company::Get(company_id)->is_ai) {
if (company_id != COMPANY_SPECTATOR && !Company::IsHumanID(company_id)) {
IConsoleError("You cannot move clients to AI companies.");
return true;
}
@@ -741,15 +741,14 @@ DEF_CONSOLE_CMD(ConResetCompany)
if (argc != 2) return false;
CompanyID index = (CompanyID)(atoi(argv[1]) - 1);
const Company *c = Company::GetIfValid(index);
/* Check valid range */
if (c == NULL) {
if (!Company::IsValidID(index)) {
IConsolePrintF(CC_ERROR, "Company does not exist. Company-id must be between 1 and %d.", MAX_COMPANIES);
return true;
}
if (c->is_ai) {
if (!Company::IsHumanID(index)) {
IConsoleError("Company is owned by an AI.");
return true;
}
@@ -1064,7 +1063,7 @@ DEF_CONSOLE_CMD(ConReloadAI)
return true;
}
if (IsHumanCompany(company_id)) {
if (Company::IsHumanID(company_id)) {
IConsoleWarning("Company is not controlled by an AI.");
return true;
}
@@ -1101,7 +1100,7 @@ DEF_CONSOLE_CMD(ConStopAI)
return true;
}
if (IsHumanCompany(company_id)) {
if (Company::IsHumanID(company_id)) {
IConsoleWarning("Company is not controlled by an AI.");
return true;
}