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

(svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost.

Browse Source
This commit is contained in:
alberth
2010-03-06 13:23:33 +00:00
parent 32bd795e62
commit beb46d1a7f
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/station.cpp
View File

@@ -400,16 +400,15 @@ CommandCost StationRect::BeforeAddTile(TileIndex tile, StationRectMode mode)
return CommandCost();
}
bool StationRect::BeforeAddRect(TileIndex tile, int w, int h, StationRectMode mode)
CommandCost StationRect::BeforeAddRect(TileIndex tile, int w, int h, StationRectMode mode)
{
if (mode == ADD_FORCE || (w <= _settings_game.station.station_spread && h <= _settings_game.station.station_spread)) {
/* Important when the old rect is completely inside the new rect, resp. the old one was empty. */
CommandCost ret = this->BeforeAddTile(tile, mode);
if (ret.Succeeded()) ret = this->BeforeAddTile(TILE_ADDXY(tile, w - 1, h - 1), mode);
if (ret.Succeeded()) return true;
ret.SetGlobalErrorMessage();
return ret;
}
return false;
return CommandCost();
}
/**