From c65901fef23501a167df4db2d86be54e949d47ba Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Fri, 21 Jan 2022 23:34:39 +0000 Subject: [PATCH] Add a baseset GRF for misc GUI sprites --- media/baseset/CMakeLists.txt | 1 + media/baseset/misc_gui.grf | Bin 0 -> 54 bytes media/baseset/misc_gui/misc_gui.nfo | 7 +++++++ media/baseset/misc_gui/misc_gui.png | Bin 0 -> 2710 bytes src/gfxinit.cpp | 3 +++ src/table/sprites.h | 6 +++++- 6 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 media/baseset/misc_gui.grf create mode 100644 media/baseset/misc_gui/misc_gui.nfo create mode 100644 media/baseset/misc_gui/misc_gui.png 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 0000000000000000000000000000000000000000..f3eb7650a0893606e33e34927fd315eb8462c069 GIT binary patch literal 54 zcma!KVC3XvU}RumU;z;?n3;i`7hErR9|*880>KT59h?^=P6+QXxS?~xY=;L>4G;hT D06`0% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..00cb5611bf257a475e9dae994828d56c0af1eef5 GIT binary patch literal 2710 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 P-9UKgHtMgzoSgpxTV?gr literal 0 HcmV?d00001 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;