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

Add a baseset GRF for misc GUI sprites

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-01-21 23:34:39 +00:00
parent 8ffe519179
commit c65901fef2
6 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/baseset/CMakeLists.txt
View File

@@ -22,6 +22,7 @@ set(BASESET_OTHER_SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/extra_signals.grf ${CMAKE_CURRENT_SOURCE_DIR}/extra_signals.grf
${CMAKE_CURRENT_SOURCE_DIR}/route_step.grf ${CMAKE_CURRENT_SOURCE_DIR}/route_step.grf
${CMAKE_CURRENT_SOURCE_DIR}/tracerestrict.grf ${CMAKE_CURRENT_SOURCE_DIR}/tracerestrict.grf
${CMAKE_CURRENT_SOURCE_DIR}/misc_gui.grf
) )
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)

BIN
media/baseset/misc_gui.grf Normal file
View File

Binary file not shown.

7
media/baseset/misc_gui/misc_gui.nfo Normal file
View File

@@ -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

BIN
media/baseset/misc_gui/misc_gui.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

3
src/gfxinit.cpp
View File

@@ -188,6 +188,9 @@ static void LoadSpriteTables()
/* Tracerestrict sprites. */ /* Tracerestrict sprites. */
LoadGrfFile("tracerestrict.grf", SPR_TRACERESTRICT_BASE, false); 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 */ /* Fill duplicate original signal graphics sprite block */
for (uint i = 0; i < DUP_ORIGINAL_SIGNALS_SPRITE_COUNT; i++) { for (uint i = 0; i < DUP_ORIGINAL_SIGNALS_SPRITE_COUNT; i++) {
DupSprite(SPR_ORIGINAL_SIGNALS_BASE + i, SPR_DUP_ORIGINAL_SIGNALS_BASE + i); DupSprite(SPR_ORIGINAL_SIGNALS_BASE + i, SPR_DUP_ORIGINAL_SIGNALS_BASE + i);

6
src/table/sprites.h
View File

@@ -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 SpriteID SPR_TRACERESTRICT_BASE = SPR_ROUTE_STEP_BASE + ROUTE_STEP_SPRITE_COUNT;
static const uint16 TRACERESTRICT_SPRITE_COUNT = 2; 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 */ /* 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 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 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; static const uint16 DUP_SIGNALS_SPRITE_COUNT = PRESIGNAL_SEMAPHORE_AND_PBS_SPRITE_COUNT;