dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()

Browse Source
This commit is contained in:
smatz
2009-05-18 16:21:28 +00:00
parent 1eca6aefeb
commit 512db5248e
35 changed files with 201 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/strings.cpp
View File

@@ -846,8 +846,9 @@ static char *FormatString(char *buff, const char *str, const int64 *argv, uint c
case SCC_STATION_NAME: { // {STATION}
StationID sid = GetInt32(&argv);
const Station *st = Station::GetIfValid(sid);
if (!Station::IsValidID(sid)) {
if (st == NULL) {
/* 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. */
@@ -855,7 +856,6 @@ static char *FormatString(char *buff, const char *str, const int64 *argv, uint c
break;
}
const Station *st = Station::Get(sid);
if (st->name != NULL) {
buff = strecpy(buff, st->name, last);
} else {