diff options
| author | smatz <smatz@openttd.org> | 2009-05-17 01:00:56 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-17 01:00:56 +0000 |
| commit | 871107f52952ee59c353feab933126ed206e60bf (patch) | |
| tree | 482884dfedc1700bddb8812f1de755212ed8bb22 /src/console_cmds.cpp | |
| parent | ed1e54bd84074412ea9f273b7cd86aed42d844ce (diff) | |
| download | openttd-871107f52952ee59c353feab933126ed206e60bf.tar.xz | |
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
Diffstat (limited to 'src/console_cmds.cpp')
| -rw-r--r-- | src/console_cmds.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 48f5d4a2c..cde830aa0 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -635,7 +635,7 @@ DEF_CONSOLE_CMD(ConJoinCompany) CompanyID company_id = (CompanyID)(atoi(argv[1]) <= MAX_COMPANIES ? atoi(argv[1]) - 1 : atoi(argv[1])); /* Check we have a valid company id! */ - if (!IsValidCompanyID(company_id) && company_id != COMPANY_SPECTATOR) { + if (!Company::IsValidID(company_id) && company_id != COMPANY_SPECTATOR) { IConsolePrintF(CC_ERROR, "Company does not exist. Company-id must be between 1 and %d.", MAX_COMPANIES); return true; } @@ -688,7 +688,7 @@ DEF_CONSOLE_CMD(ConMoveClient) return true; } - if (!IsValidCompanyID(company_id) && company_id != COMPANY_SPECTATOR) { + if (!Company::IsValidID(company_id) && company_id != COMPANY_SPECTATOR) { IConsolePrintF(CC_ERROR, "Company does not exist. Company-id must be between 1 and %d.", MAX_COMPANIES); return true; } @@ -729,7 +729,7 @@ DEF_CONSOLE_CMD(ConResetCompany) index = (CompanyID)(atoi(argv[1]) - 1); /* Check valid range */ - if (!IsValidCompanyID(index)) { + if (!Company::IsValidID(index)) { IConsolePrintF(CC_ERROR, "Company does not exist. Company-id must be between 1 and %d.", MAX_COMPANIES); return true; } @@ -1049,7 +1049,7 @@ DEF_CONSOLE_CMD(ConReloadAI) } CompanyID company_id = (CompanyID)(atoi(argv[1]) - 1); - if (!IsValidCompanyID(company_id)) { + if (!Company::IsValidID(company_id)) { IConsolePrintF(CC_DEFAULT, "Unknown company. Company range is between 1 and %d.", MAX_COMPANIES); return true; } @@ -1086,7 +1086,7 @@ DEF_CONSOLE_CMD(ConStopAI) } CompanyID company_id = (CompanyID)(atoi(argv[1]) - 1); - if (!IsValidCompanyID(company_id)) { + if (!Company::IsValidID(company_id)) { IConsolePrintF(CC_DEFAULT, "Unknown company. Company range is between 1 and %d.", MAX_COMPANIES); return true; } @@ -1464,7 +1464,7 @@ DEF_CONSOLE_CMD(ConSayCompany) if (argc != 3) return false; CompanyID company_id = (CompanyID)(atoi(argv[1]) - 1); - if (!IsValidCompanyID(company_id)) { + if (!Company::IsValidID(company_id)) { IConsolePrintF(CC_DEFAULT, "Unknown company. Company range is between 1 and %d.", MAX_COMPANIES); return true; } @@ -1508,7 +1508,7 @@ bool NetworkChangeCompanyPassword(byte argc, char *argv[]) return true; } - if (!IsValidCompanyID(_local_company)) { + if (!Company::IsValidID(_local_company)) { IConsoleError("You have to own a company to make use of this command."); return false; } |