diff --git a/media/baseset/CMakeLists.txt b/media/baseset/CMakeLists.txt index 465006d88a..cead9fd77a 100644 --- a/media/baseset/CMakeLists.txt +++ b/media/baseset/CMakeLists.txt @@ -22,6 +22,7 @@ set(BASESET_OTHER_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/extra_signals.grf ${CMAKE_CURRENT_SOURCE_DIR}/route_step.grf ${CMAKE_CURRENT_SOURCE_DIR}/tracerestrict.grf + ${CMAKE_CURRENT_SOURCE_DIR}/misc_gui.grf ) if (UNIX AND NOT APPLE) diff --git a/media/baseset/misc_gui.grf b/media/baseset/misc_gui.grf new file mode 100644 index 0000000000..f3eb7650a0 Binary files /dev/null and b/media/baseset/misc_gui.grf differ diff --git a/media/baseset/misc_gui/misc_gui.nfo b/media/baseset/misc_gui/misc_gui.nfo new file mode 100644 index 0000000000..9338978b32 --- /dev/null +++ b/media/baseset/misc_gui/misc_gui.nfo @@ -0,0 +1,7 @@ +// Automatically generated by GRFCODEC. Do not modify! +// (Info version 32) +// Escapes: 2+ 2- 2< 2> 2u< 2u> 2/ 2% 2u/ 2u% 2* 2& 2| 2^ 2sto = 2s 2rst = 2r 2psto 2ror = 2rot 2cmp 2ucmp 2<< 2u>> 2>> +// Escapes: 71 70 7= 7! 7< 7> 7G 7g 7gG 7GG 7gg 7c 7C +// Escapes: D= = DR D+ = DF D- = DC Du* = DM D* = DnF Du<< = DnC D<< = DO D& D| Du/ D/ Du% D% +// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags + 0 misc_gui.png 8bpp 10 10 9 9 1 0 normal diff --git a/media/baseset/misc_gui/misc_gui.png b/media/baseset/misc_gui/misc_gui.png new file mode 100644 index 0000000000..00cb5611bf Binary files /dev/null and b/media/baseset/misc_gui/misc_gui.png differ diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index fc7c6a2e2f..12ac1418b9 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -188,6 +188,9 @@ static void LoadSpriteTables() /* Tracerestrict sprites. */ LoadGrfFile("tracerestrict.grf", SPR_TRACERESTRICT_BASE, false); + /* Tracerestrict sprites. */ + LoadGrfFile("misc_gui.grf", SPR_MISC_GUI_BASE, false); + /* Fill duplicate original signal graphics sprite block */ for (uint i = 0; i < DUP_ORIGINAL_SIGNALS_SPRITE_COUNT; i++) { DupSprite(SPR_ORIGINAL_SIGNALS_BASE + i, SPR_DUP_ORIGINAL_SIGNALS_BASE + i); diff --git a/src/table/sprites.h b/src/table/sprites.h index 102d04e380..719eb1e242 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -344,8 +344,12 @@ static const SpriteID ROUTE_STEP_SPRITE_COUNT = 4; static const SpriteID SPR_TRACERESTRICT_BASE = SPR_ROUTE_STEP_BASE + ROUTE_STEP_SPRITE_COUNT; static const uint16 TRACERESTRICT_SPRITE_COUNT = 2; +/* Tracerestrict sprites */ +static const SpriteID SPR_MISC_GUI_BASE = SPR_TRACERESTRICT_BASE + TRACERESTRICT_SPRITE_COUNT; +static const uint16 MISC_GUI_SPRITE_COUNT = 1; + /* Duplicated signal sprites */ -static const SpriteID SPR_DUP_ORIGINAL_SIGNALS_BASE = SPR_TRACERESTRICT_BASE + TRACERESTRICT_SPRITE_COUNT; +static const SpriteID SPR_DUP_ORIGINAL_SIGNALS_BASE = SPR_MISC_GUI_BASE + MISC_GUI_SPRITE_COUNT; static const uint16 DUP_ORIGINAL_SIGNALS_SPRITE_COUNT = 16; static const SpriteID SPR_DUP_SIGNALS_BASE = SPR_DUP_ORIGINAL_SIGNALS_BASE + DUP_ORIGINAL_SIGNALS_SPRITE_COUNT; static const uint16 DUP_SIGNALS_SPRITE_COUNT = PRESIGNAL_SEMAPHORE_AND_PBS_SPRITE_COUNT;