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

Merge branch 'master' into jgrpp-nrt

Browse Source 
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2019-07-11 20:03:23 +01:00
parent ba8ed880c1 f1c3915341
commit dbc5f1baed
118 changed files with 2968 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/road_cmd.cpp
View File

@@ -85,8 +85,8 @@ void ResolveRoadTypeGUISprites(RoadTypeInfo *rti)
{
SpriteID cursors_base = GetCustomRoadSprite(rti, INVALID_TILE, ROTSG_CURSORS);
if (cursors_base != 0) {
rti->gui_sprites.build_x_road = cursors_base + 0;
rti->gui_sprites.build_y_road = cursors_base + 1;
rti->gui_sprites.build_y_road = cursors_base + 0;
rti->gui_sprites.build_x_road = cursors_base + 1;
rti->gui_sprites.auto_road = cursors_base + 2;
rti->gui_sprites.build_depot = cursors_base + 3;
rti->gui_sprites.build_tunnel = cursors_base + 4;
@@ -1431,7 +1431,7 @@ static CommandCost ClearTile_Road(TileIndex tile, DoCommandFlag flags)
/* Must iterate over the roadtypes in a reverse manner because
* tram tracks must be removed before the road bits. */
for (RoadTramType rtt : { RTT_TRAM, RTT_ROAD }) {
if (GetRoadType(tile, rtt) == INVALID_ROADTYPE) continue;
if (!MayHaveRoad(tile) || GetRoadType(tile, rtt) == INVALID_ROADTYPE) continue;
CommandCost tmp_ret = RemoveRoad(tile, flags, GetCrossingRoadBits(tile), rtt, false);
if (tmp_ret.Failed()) return tmp_ret;