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

Merge branch 'tracerestrict' into tracerestrict-sx

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-06-18 11:11:18 +01:00
parent faf8dab12a a091780843
commit fe1fee456a
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

@@ -1895,9 +1895,9 @@ static void DrawSingleSignal(TileIndex tile, const RailtypeInfo *rti, Track trac
sprite += type * 16 + variant * 64 + image * 2 + condition + (type > SIGTYPE_LAST_NOPBS ? 64 : 0); sprite += type * 16 + variant * 64 + image * 2 + condition + (type > SIGTYPE_LAST_NOPBS ? 64 : 0);
} }
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);
if (is_custom_sprite && show_restricted && _settings_client.gui.show_restricted_signal_default) { if (is_custom_sprite && show_restricted && _settings_client.gui.show_restricted_signal_default) {