MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3483 from myk002/myk_unsuspend 

add unsuspend map textures
develop
Myk 2023-06-25 19:21:30 -07:00 committed by GitHub
parent f2dc910b28 d54c13121b
commit 89d11544a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/art/unsuspend.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 971 B

1
library/LuaApi.cpp
Unescape Escape View File

@ -1715,6 +1715,7 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
WRAPM(Textures, getRedPinTexposStart), WRAPM(Textures, getRedPinTexposStart),
WRAPM(Textures, getIconsTexposStart), WRAPM(Textures, getIconsTexposStart),
WRAPM(Textures, getOnOffTexposStart), WRAPM(Textures, getOnOffTexposStart),
WRAPM(Textures, getMapUnsuspendTexposStart),
WRAPM(Textures, getControlPanelTexposStart), WRAPM(Textures, getControlPanelTexposStart),
WRAPM(Textures, getThinBordersTexposStart), WRAPM(Textures, getThinBordersTexposStart),
WRAPM(Textures, getMediumBordersTexposStart), WRAPM(Textures, getMediumBordersTexposStart),

5
library/include/modules/Textures.h
Unescape Escape View File

@ -51,6 +51,11 @@ DFHACK_EXPORT long getOnOffTexposStart();
*/ */
DFHACK_EXPORT long getMapPathableTexposStart(); DFHACK_EXPORT long getMapPathableTexposStart();
/**
* Get the first texpos for the unsuspend 32x32 sprites. It's a 4x1 grid.
*/
DFHACK_EXPORT long getMapUnsuspendTexposStart();
/** /**
* Get the first texpos for the control panel icons. 10x2 grid. * Get the first texpos for the control panel icons. 10x2 grid.
*/ */

7
library/modules/Textures.cpp
Unescape Escape View File

@ -26,6 +26,7 @@ static long g_red_pin_texpos_start = -1;
static long g_icons_texpos_start = -1; static long g_icons_texpos_start = -1;
static long g_on_off_texpos_start = -1; static long g_on_off_texpos_start = -1;
static long g_pathable_texpos_start = -1; static long g_pathable_texpos_start = -1;
static long g_unsuspend_texpos_start = -1;
static long g_control_panel_texpos_start = -1; static long g_control_panel_texpos_start = -1;
static long g_thin_borders_texpos_start = -1; static long g_thin_borders_texpos_start = -1;
static long g_medium_borders_texpos_start = -1; static long g_medium_borders_texpos_start = -1;
@ -142,6 +143,8 @@ void Textures::init(color_ostream &out) {
&g_on_off_texpos_start); &g_on_off_texpos_start);
g_num_dfhack_textures += load_textures(out, "hack/data/art/pathable.png", g_num_dfhack_textures += load_textures(out, "hack/data/art/pathable.png",
&g_pathable_texpos_start, 32, 32); &g_pathable_texpos_start, 32, 32);
g_num_dfhack_textures += load_textures(out, "hack/data/art/unsuspend.png",
&g_unsuspend_texpos_start, 32, 32);
g_num_dfhack_textures += load_textures(out, "hack/data/art/control-panel.png", g_num_dfhack_textures += load_textures(out, "hack/data/art/control-panel.png",
&g_control_panel_texpos_start); &g_control_panel_texpos_start);
g_num_dfhack_textures += load_textures(out, "hack/data/art/border-thin.png", g_num_dfhack_textures += load_textures(out, "hack/data/art/border-thin.png",
@ -210,6 +213,10 @@ long Textures::getMapPathableTexposStart() {
return g_pathable_texpos_start; return g_pathable_texpos_start;
} }
long Textures::getMapUnsuspendTexposStart() {
return g_unsuspend_texpos_start;
}
long Textures::getControlPanelTexposStart() { long Textures::getControlPanelTexposStart() {
return g_control_panel_texpos_start; return g_control_panel_texpos_start;
} }