Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-09 19:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3372) - Fix: update signal states when building or removing rail station blocks

Browse Source
This commit is contained in:
peter1138 2006-01-06 17:45:43 +00:00
parent b23ffe4045
commit 183f6f6d07
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
station_cmd.c
View File

@ -1016,6 +1016,7 @@ int32 CmdBuildRailroadStation(int x, int y, uint32 flags, uint32 p1, uint32 p2)
byte *layout_ptr; byte *layout_ptr;
StationID station_index = st->index; StationID station_index = st->index;
const StationSpec *statspec; const StationSpec *statspec;
Track track;
// Now really clear the land below the station // Now really clear the land below the station
// It should never return CMD_ERROR.. but you never know ;) // It should never return CMD_ERROR.. but you never know ;)
@ -1033,6 +1034,7 @@ int32 CmdBuildRailroadStation(int x, int y, uint32 flags, uint32 p1, uint32 p2)
st->build_date = _date; st->build_date = _date;
tile_delta = direction ? TileDiffXY(0, 1) : TileDiffXY(1, 0); tile_delta = direction ? TileDiffXY(0, 1) : TileDiffXY(1, 0);
track = direction ? TRACK_DIAG2 : TRACK_DIAG1;
statspec = (p2 & 0x10) != 0 ? GetCustomStation(STAT_CLASS_DFLT, p2 >> 8) : NULL; statspec = (p2 & 0x10) != 0 ? GetCustomStation(STAT_CLASS_DFLT, p2 >> 8) : NULL;
layout_ptr = alloca(numtracks * plat_len); layout_ptr = alloca(numtracks * plat_len);
@ -1054,6 +1056,7 @@ int32 CmdBuildRailroadStation(int x, int y, uint32 flags, uint32 p1, uint32 p2)
tile += tile_delta; tile += tile_delta;
} while (--w); } while (--w);
SetSignalsOnBothDir(tile_org, track);
tile_org += tile_delta ^ TileDiffXY(1, 1); // perpendicular to tile_delta tile_org += tile_delta ^ TileDiffXY(1, 1); // perpendicular to tile_delta
} while (--numtracks); } while (--numtracks);
@ -1147,7 +1150,9 @@ int32 CmdRemoveFromRailroadStation(int x, int y, uint32 flags, uint32 p1, uint32
// if we reached here, it means we can actually delete it. do that. // if we reached here, it means we can actually delete it. do that.
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
Track track = HASBIT(_m[tile].m5, 0) ? TRACK_DIAG2 : TRACK_DIAG1;
DoClearSquare(tile); DoClearSquare(tile);
SetSignalsOnBothDir(tile, track);
// now we need to make the "spanned" area of the railway station smaller if we deleted something at the edges. // now we need to make the "spanned" area of the railway station smaller if we deleted something at the edges.
// we also need to adjust train_tile. // we also need to adjust train_tile.
MakeRailwayStationAreaSmaller(st); MakeRailwayStationAreaSmaller(st);
@ -1307,8 +1312,11 @@ static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
if (TileBelongsToRailStation(st, tile)) { if (TileBelongsToRailStation(st, tile)) {
if (!EnsureNoVehicle(tile)) if (!EnsureNoVehicle(tile))
return CMD_ERROR; return CMD_ERROR;
if (flags & DC_EXEC) if (flags & DC_EXEC) {
Track track = HASBIT(_m[tile].m5, 0) ? TRACK_DIAG2 : TRACK_DIAG1;
DoClearSquare(tile); DoClearSquare(tile);
SetSignalsOnBothDir(tile, track);
}
} }
tile += TileDiffXY(1, 0); tile += TileDiffXY(1, 0);
} while (--w); } while (--w);