miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #12: Crash when rail blueprint is out of map bounds

Browse Source
This commit is contained in:
dP
2021-11-08 21:16:16 +03:00
parent 8da4a0da51
commit f0e478e015
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/citymania/cm_blueprint.cpp
View File

@@ -111,7 +111,9 @@ CommandContainer GetBlueprintCommand(TileIndex start, const Blueprint::Item &ite
auto end_tile = start_tile; auto end_tile = start_tile;
auto tdir = item.u.rail.track.start_dir; auto tdir = item.u.rail.track.start_dir;
for (auto i = 1; i < item.u.rail.track.length; i++) { for (auto i = 1; i < item.u.rail.track.length; i++) {
end_tile = TileAddByDiagDir(end_tile, TrackdirToExitdir(tdir)); auto new_tile = AddTileIndexDiffCWrap(end_tile, TileIndexDiffCByDiagDir(TrackdirToExitdir(tdir)));
if (new_tile == INVALID_TILE) break;
end_tile = new_tile;
tdir = NextTrackdir(tdir); tdir = NextTrackdir(tdir);
} }
return CommandContainer { return CommandContainer {
@@ -212,7 +214,9 @@ std::multimap<TileIndex, ObjectTileHighlight> Blueprint::GetTiles(TileIndex tile
auto tdir = o.u.rail.track.start_dir; auto tdir = o.u.rail.track.start_dir;
for (auto i = 0; i < o.u.rail.track.length; i++) { for (auto i = 0; i < o.u.rail.track.length; i++) {
add_tile(end_tile, ObjectTileHighlight::make_rail_track(palette, TrackdirToTrack(tdir))); add_tile(end_tile, ObjectTileHighlight::make_rail_track(palette, TrackdirToTrack(tdir)));
end_tile = TileAddByDiagDir(end_tile, TrackdirToExitdir(tdir)); auto new_tile = AddTileIndexDiffCWrap(end_tile, TileIndexDiffCByDiagDir(TrackdirToExitdir(tdir)));
if (new_tile == INVALID_TILE) break;
end_tile = new_tile;
tdir = NextTrackdir(tdir); tdir = NextTrackdir(tdir);
} }
break; break;