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

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

View File

@@ -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);