diff options
| author | smatz <smatz@openttd.org> | 2009-05-18 16:21:28 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-18 16:21:28 +0000 |
| commit | 8808f3beea881af5652716c883a21c8031b5e390 (patch) | |
| tree | bc14c65d1e66c407b72d254fc926d105eea2f1e4 /src/station_cmd.cpp | |
| parent | 5fe906e14992f7a301ae94c357e80af076ab7a63 (diff) | |
| download | openttd-8808f3beea881af5652716c883a21c8031b5e390.tar.xz | |
(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index e3317fd43..4334dfe8c 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2911,10 +2911,8 @@ static bool IsUniqueStationName(const char *name) */ CommandCost CmdRenameStation(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { - if (!Station::IsValidID(p1)) return CMD_ERROR; - - Station *st = Station::Get(p1); - if (!CheckOwnership(st->owner)) return CMD_ERROR; + Station *st = Station::GetIfValid(p1); + if (st == NULL || !CheckOwnership(st->owner)) return CMD_ERROR; bool reset = StrEmpty(text); |