gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16942) -Codechange: document CanExpandRailStation and remove the 'magic' array of numbers for a named struct

Browse Source
This commit is contained in:
rubidium 2009-07-24 17:05:17 +00:00
parent 9e9c397bf6
commit 3ec35e4e8d
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/station_cmd.cpp
View File

@ -720,21 +720,24 @@ CommandCost CheckFlatLandBelow(TileIndex tile, uint w, uint h, DoCommandFlag fla
return cost; return cost;
} }
static bool CanExpandRailroadStation(const Station *st, uint *fin, Axis axis) /**
* Check whether we can expand the rail part of the given station.
* @param st the station to expand
* @param cur_ta the current (and if all is fine new) tile area of the rail part of the station
* @param axis the axis of the newly build rail
* @return true if we are allowed to extend
*/
static bool CanExpandRailStation(const Station *st, TileArea &cur_ta, Axis axis)
{ {
uint curw = st->trainst_w; TileArea new_ta = cur_ta;
uint curh = st->trainst_h;
TileIndex tile = fin[0];
uint w = fin[1];
uint h = fin[2];
if (_settings_game.station.nonuniform_stations) { if (_settings_game.station.nonuniform_stations) {
/* determine new size of train station region.. */ /* determine new size of train station region.. */
int x = min(TileX(st->train_tile), TileX(tile)); int x = min(TileX(st->train_tile), TileX(cur_ta.tile));
int y = min(TileY(st->train_tile), TileY(tile)); int y = min(TileY(st->train_tile), TileY(cur_ta.tile));
curw = max(TileX(st->train_tile) + curw, TileX(tile) + w) - x; new_ta.w = max(TileX(st->train_tile) + new_ta.w, TileX(cur_ta.tile) + cur_ta.w) - x;
curh = max(TileY(st->train_tile) + curh, TileY(tile) + h) - y; new_ta.h = max(TileY(st->train_tile) + new_ta.h, TileY(cur_ta.tile) + cur_ta.h) - y;
tile = TileXY(x, y); new_ta.tile = TileXY(x, y);
} else { } else {
/* do not allow modifying non-uniform stations, /* do not allow modifying non-uniform stations,
* the uniform-stations code wouldn't handle it well */ * the uniform-stations code wouldn't handle it well */
@ -752,36 +755,33 @@ static bool CanExpandRailroadStation(const Station *st, uint *fin, Axis axis)
} }
/* check if the new station adjoins the old station in either direction */ /* check if the new station adjoins the old station in either direction */
if (curw == w && st->train_tile == tile + TileDiffXY(0, h)) { if (new_ta.w == cur_ta.w && st->train_tile == cur_ta.tile + TileDiffXY(0, cur_ta.h)) {
/* above */ /* above */
curh += h; new_ta.h += cur_ta.h;
} else if (curw == w && st->train_tile == tile - TileDiffXY(0, curh)) { } else if (new_ta.w == cur_ta.w && st->train_tile == cur_ta.tile - TileDiffXY(0, new_ta.h)) {
/* below */ /* below */
tile -= TileDiffXY(0, curh); new_ta.tile -= TileDiffXY(0, new_ta.h);
curh += h; new_ta.h += cur_ta.h;
} else if (curh == h && st->train_tile == tile + TileDiffXY(w, 0)) { } else if (new_ta.h == cur_ta.h && st->train_tile == cur_ta.tile + TileDiffXY(cur_ta.w, 0)) {
/* to the left */ /* to the left */
curw += w; new_ta.w += cur_ta.w;
} else if (curh == h && st->train_tile == tile - TileDiffXY(curw, 0)) { } else if (new_ta.h == cur_ta.h && st->train_tile == cur_ta.tile - TileDiffXY(new_ta.w, 0)) {
/* to the right */ /* to the right */
tile -= TileDiffXY(curw, 0); new_ta.tile -= TileDiffXY(new_ta.w, 0);
curw += w; new_ta.w += cur_ta.w;
} else { } else {
_error_message = STR_NONUNIFORM_STATIONS_DISALLOWED; _error_message = STR_NONUNIFORM_STATIONS_DISALLOWED;
return false; return false;
} }
} }
/* make sure the final size is not too big. */ /* make sure the final size is not too big. */
if (curw > _settings_game.station.station_spread || curh > _settings_game.station.station_spread) { if (new_ta.w > _settings_game.station.station_spread || new_ta.h > _settings_game.station.station_spread) {
_error_message = STR_ERROR_STATION_TOO_SPREAD_OUT; _error_message = STR_ERROR_STATION_TOO_SPREAD_OUT;
return false; return false;
} }
/* now tile contains the new value for st->train_tile /* Update the current values with the new. */
* curw, curh contain the new value for width and height */ cur_ta = new_ta;
fin[0] = tile;
fin[1] = curw;
fin[2] = curh;
return true; return true;
} }
@ -872,10 +872,7 @@ CommandCost CmdBuildRailroadStation(TileIndex tile_org, DoCommandFlag flags, uin
if (h_org > _settings_game.station.station_spread || w_org > _settings_game.station.station_spread) return CMD_ERROR; if (h_org > _settings_game.station.station_spread || w_org > _settings_game.station.station_spread) return CMD_ERROR;
/* these values are those that will be stored in train_tile and station_platforms */ /* these values are those that will be stored in train_tile and station_platforms */
uint finalvalues[3]; TileArea new_location = { tile_org, w_org, h_org };
finalvalues[0] = tile_org;
finalvalues[1] = w_org;
finalvalues[2] = h_org;
/* Make sure the area below consists of clear tiles. (OR tiles belonging to a certain rail station) */ /* Make sure the area below consists of clear tiles. (OR tiles belonging to a certain rail station) */
StationID est = INVALID_STATION; StationID est = INVALID_STATION;
@ -929,7 +926,7 @@ CommandCost CmdBuildRailroadStation(TileIndex tile_org, DoCommandFlag flags, uin
/* check if we want to expanding an already existing station? */ /* check if we want to expanding an already existing station? */
if (!_settings_game.station.join_stations) if (!_settings_game.station.join_stations)
return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD); return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD);
if (!CanExpandRailroadStation(st, finalvalues, axis)) if (!CanExpandRailStation(st, new_location, axis))
return CMD_ERROR; return CMD_ERROR;
} }
@ -985,11 +982,11 @@ CommandCost CmdBuildRailroadStation(TileIndex tile_org, DoCommandFlag flags, uin
ret = CheckFlatLandBelow(tile_org, w_org, h_org, flags, 5 << axis, _settings_game.station.nonuniform_stations ? &est : NULL); ret = CheckFlatLandBelow(tile_org, w_org, h_org, flags, 5 << axis, _settings_game.station.nonuniform_stations ? &est : NULL);
if (CmdFailed(ret)) return ret; if (CmdFailed(ret)) return ret;
st->train_tile = finalvalues[0]; st->train_tile = new_location.tile;
st->AddFacility(FACIL_TRAIN, finalvalues[0]); st->AddFacility(FACIL_TRAIN, new_location.tile);
st->trainst_w = finalvalues[1]; st->trainst_w = new_location.w;
st->trainst_h = finalvalues[2]; st->trainst_h = new_location.h;
st->rect.BeforeAddRect(tile_org, w_org, h_org, StationRect::ADD_TRY); st->rect.BeforeAddRect(tile_org, w_org, h_org, StationRect::ADD_TRY);