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
2015-11-24 20:30:19 +00:00
parent 9ee5aecbaf 8eac403224
commit 5b1fe71552
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gfxinit.cpp
View File

@@ -46,6 +46,9 @@ static const SpriteID * const _landscape_spriteindexes[] = {
_landscape_spriteindexes_toyland, _landscape_spriteindexes_toyland,
}; };
/** file index of first user-added GRF file */
int _first_user_grf_file_index;
/** /**
* Load an old fashioned GRF file. * Load an old fashioned GRF file.
* @param filename The name of the file to open. * @param filename The name of the file to open.
@@ -238,6 +241,8 @@ static void LoadSpriteTables()
LoadNewGRF(SPR_NEWGRFS_BASE, i); LoadNewGRF(SPR_NEWGRFS_BASE, i);
_first_user_grf_file_index = i + 1;
/* Free and remove the top element. */ /* Free and remove the top element. */
delete master; delete master;
_grfconfig = top; _grfconfig = top;

3
src/rail_cmd.cpp
View File

@@ -35,6 +35,7 @@
#include "object_map.h" #include "object_map.h"
#include "tracerestrict.h" #include "tracerestrict.h"
#include "programmable_signals.h" #include "programmable_signals.h"
#include "spritecache.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/railtypes.h" #include "table/railtypes.h"
@@ -2003,6 +2004,8 @@ 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;
} }
extern uint _first_user_grf_file_index;
if (!is_custom_sprite) is_custom_sprite = (GetOriginFileSlot(sprite) >= _first_user_grf_file_index);
if (!is_custom_sprite && variant == SIG_ELECTRIC && IsRestrictedSignal(tile) && GetExistingTraceRestrictProgram(tile, track) != NULL) { if (!is_custom_sprite && variant == SIG_ELECTRIC && IsRestrictedSignal(tile) && GetExistingTraceRestrictProgram(tile, track) != NULL) {
if (type == SIGTYPE_PBS || type == SIGTYPE_PBS_ONEWAY) { if (type == SIGTYPE_PBS || type == SIGTYPE_PBS_ONEWAY) {