Merge branch 'tracerestrict-sx' into jgrpp
Conflicts: src/gfxinit.cpp src/rail_cmd.cpp src/table/sprites.h
This commit is contained in:
@@ -179,6 +179,9 @@ static void LoadSpriteTables()
|
||||
/* Progsignal sprites. */
|
||||
LoadGrfFile("progsignals.grf", SPR_PROGSIGNAL_BASE, i++);
|
||||
|
||||
/* Tracerestrict sprites. */
|
||||
LoadGrfFile("tracerestrict.grf", SPR_TRACERESTRICT_BASE, i++);
|
||||
|
||||
/*
|
||||
* The second basic file always starts at the given location and does
|
||||
* contain a different amount of sprites depending on the "type"; DOS
|
||||
|
||||
Reference in New Issue
Block a user