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

Merge branch 'improved_breakdowns' into jgrpp

Browse Source 
# Conflicts:
#	src/vehiclelist.cpp
This commit is contained in:
Jonathan G Rennison
2017-08-15 19:26:26 +01:00
parent 1d1718c226 2d66f25f6c
commit f34833f111
60 changed files with 261 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/town_cmd.cpp
View File

@@ -1404,7 +1404,7 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
case TL_3X3_GRID: // Use 2x2 grid afterwards!
GrowTownWithExtraHouse(t1, TileAddByDiagDir(house_tile, target_dir));
/* FALL THROUGH */
FALLTHROUGH;
case TL_2X2_GRID:
rcmd = GetTownRoadGridElement(t1, tile, target_dir);
@@ -1413,7 +1413,7 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
case TL_BETTER_ROADS: // Use original afterwards!
GrowTownWithExtraHouse(t1, TileAddByDiagDir(house_tile, target_dir));
/* FALL THROUGH */
FALLTHROUGH;
case TL_ORIGINAL:
/* Allow a house at the edge. 60% chance or
@@ -3494,7 +3494,7 @@ Town *ClosestTownFromTile(TileIndex tile, uint threshold)
return town;
}
/* FALL THROUGH */
FALLTHROUGH;
case MP_HOUSE:
return Town::GetByTile(tile);