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

Merge branch 'tracerestrict-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/rail_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2016-06-18 11:12:20 +01:00
parent 3db5b67376 fe1fee456a
commit afb5b625ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rail_cmd.cpp
View File

@@ -2061,9 +2061,9 @@ static void DrawSingleSignal(TileIndex tile, const RailtypeInfo *rti, Track trac
sprite = SPR_PROGSIGNAL_BASE + 16 + image * 2 + condition; sprite = SPR_PROGSIGNAL_BASE + 16 + image * 2 + condition;
is_custom_sprite = false; is_custom_sprite = false;
} else { } else {
uint origin_slot = GetOriginFileSlot(sprite); int origin_slot = GetOriginFileSlot(sprite);
extern uint _first_user_grf_file_index; extern int _first_user_grf_file_index;
extern uint _opengfx_grf_file_index; extern int _opengfx_grf_file_index;
if (!is_custom_sprite) is_custom_sprite = origin_slot != _opengfx_grf_file_index && (origin_slot >= _first_user_grf_file_index); if (!is_custom_sprite) is_custom_sprite = origin_slot != _opengfx_grf_file_index && (origin_slot >= _first_user_grf_file_index);
} }