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/strings.cpp | |
parent | ed1e54bd84074412ea9f273b7cd86aed42d844ce (diff) | |
download | openttd-871107f52952ee59c353feab933126ed206e60bf.tar.xz |
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
Diffstat (limited to 'src/strings.cpp')
-rw-r--r-- | src/strings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index 0af358b41..00aee98a2 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -847,7 +847,7 @@ static char *FormatString(char *buff, const char *str, const int64 *argv, uint c case SCC_STATION_NAME: { // {STATION} StationID sid = GetInt32(&argv); - if (!IsValidStationID(sid)) { + if (!Station::IsValidID(sid)) { /* The station doesn't exist anymore. The only place where we might * be "drawing" an invalid station is in the case of cargo that is * in transit. */ @@ -986,7 +986,7 @@ static char *FormatString(char *buff, const char *str, const int64 *argv, uint c CompanyID company = (CompanyID)GetInt32(&argv); /* Nothing is added for AI or inactive companies */ - if (IsValidCompanyID(company) && IsHumanCompany(company)) { + if (Company::IsValidID(company) && IsHumanCompany(company)) { int64 args[1]; args[0] = company + 1; buff = GetStringWithArgs(buff, STR_COMPANY_NUM, args, last); |