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

Merge branch 'master' into tracerestrict

Browse Source 
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
This commit is contained in:
Jonathan G Rennison
2015-08-15 00:28:14 +01:00
parent 76707fb72a 8cfc1e9d23
commit 29c4f244f3
83 changed files with 7009 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rail_cmd.cpp
View File

@@ -1977,7 +1977,7 @@ static void DrawTrackDetails(const TileInfo *ti, const RailtypeInfo *rti)
/* Base sprite for track fences.
* Note: Halftile slopes only have fences on the upper part. */
uint num_sprites = 0;
SpriteID base_image = GetCustomRailSprite(rti, ti->tile, RTSG_FENCES, IsHalftileSlope(ti->tileh) ? TCX_UPPER_HALFTILE : TCX_NORMAL);
SpriteID base_image = GetCustomRailSprite(rti, ti->tile, RTSG_FENCES, IsHalftileSlope(ti->tileh) ? TCX_UPPER_HALFTILE : TCX_NORMAL, &num_sprites);
if (base_image == 0) {
base_image = SPR_TRACK_FENCE_FLAT_X;
num_sprites = 8;