From 8235680ff0263c3a42ba6bd3e3a15a07c7577da2 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 18 Jun 2023 00:55:55 -0700 Subject: [PATCH] add unsuspend map textures --- data/art/unsuspend.png | Bin 0 -> 4697 bytes library/LuaApi.cpp | 1 + library/include/modules/Textures.h | 5 +++++ library/modules/Textures.cpp | 7 +++++++ 4 files changed, 13 insertions(+) create mode 100644 data/art/unsuspend.png diff --git a/data/art/unsuspend.png b/data/art/unsuspend.png new file mode 100644 index 0000000000000000000000000000000000000000..11cb910451f6f09086b07c0eac13c590bae8c2d5 GIT binary patch literal 4697 zcmeAS@N?(olHy`uVBq!ia0y~yU`SwKU{K&-V_;x-d!ROifq~&jRY*ihP-3}4K~a8M zW=^U?No7H*LTW{38UsVct=xdyf`=7&ey4Z!HOMm>_g!96es{s+aF*rbx3tGITWWB3i+N#XAwro`1VDo@I_*ygnlnE33zaCkBK!dYPa^+F^l4~!M4b0rP z#Pqz8J7mS}d-(poo=0gfWxrN%FBWq<g(!js^=vpFZIhRzHMK5^vgEZ z?;M}?R3vp4EoOY_J;|bpNzG8^&HTp!tgELO9CrA3_N7Y|^ZosiVo#Fp-C|0SRFqwAGvze^P;QQpZK5*!N&&+?eE>KzO$G4&sU@1vwac^ zvZhV+I@0P>7Rs@25%*t?Bne?5Pj=s*zX&Z-W3FK;?0MPd zy2sIGbLPuA-#ZVl(a=2d{K#Xr*a<%-zTR{?e-1a_@5;0r9?PF~9zNoE-7+4g?RMI|KYDI&wjRC?e3BQnHM!1-}VP8?BF)Z+V;0L=XS5K z!Uvw1Ox^mWd}rz=#bswsR9=uTy<v55FG|-pw6wI;H!#vSGSV$dNz*N^%qvN((9J7W1{nb{!zHyixhS)sBr`ux z0c2)kQhsTPt&$R#f`S6n@QU05UthTKdBxCBNY2mIuShJ=H`FuG&&}0G)=^yIT2_Kz zM{!7HL8^XGYH@yPQF5wlS!!O1GO`gV$#DGzrA0Yl@1!K_r{<*QrskCt>l^ABqFCwf z=^Fso0Sbcj%-jO7u8Q0O6qO~JX^6l=@eN1@>>Xr>ROA-G%|%fS^E+5EIE<`Z@{>zJ z&hvD!RRY;>m6D&FnPLTITBI1786}yR>ZT@{8S0vtq$TTGq#B#+8W~tx7+Dya8YUT- zAQ|PES6q^qmz)YRsv@^QFEca6DlIL=)H2aBRW~&y(NfnWIVDBcGAYei*WAP+$uQY8 zEzu-73CRfmqRjNnyu=)2SAmR5$xN|Iu}n%yNlG%%O|>+#)HN|nw$QaqG_cS$Ha9Uf zH8Zd@O))kD8_69aREqOjDW;>`R!keP-Cdd83d z0Y!_Ie^F*?UP&S-o!TlHf^}5n7FanKr6!i-7lq{K=h!NNoTOl+X9#f)NZL2GBrzqi zB+(_YB-K{Q$iT?h%D~LZ&?3aZz{=R%%EV09z}(6JNqv4wW?Cg7)pnrFVFQVBkIdqd z{Gv**5F|$hrxrqZ5N=K;NVS530ytAxB_>0>P@GtnngaF)Tq-#uF)uwe#a0QLTwz)= zu_OfxLnC8Tvy^0A3zO6|U6WLUG+oP7GYef~Bjco$6iW-!6k|vr!A&pDPb(=;EJ}4u zPt7Z_RdUbFEdYm=f(AIEG*R7Bo{~>+M1Wa9156*{MH_uknE~^$jXp-0 zKolSqGIm@F5V0T^H#;sHeQ-$!D)k@+f=V4)VrX2@(h3EIQA{i(^Q}y|owdH_hv(@F zkGmqyv(DzU(hlmppVD-$OXA~X$pgCkPP6n*d9>T-LWkh|z5EkicNDnDADYR$GCaQV zWa-u^nsNPg{K?EGzHx%B@z9Ob&)+y(`!d=AQHC&fQ#|`n`uko=ym{-1EZg z`i#)?v#qXe`=dH7B&qV~`uWA5%d;B#e`xxC5VYUP87uuj=)TI7lPr97lYgkyP3Els zrFCfe6_e64nhDybzOtLYS4v&xy#GqTEcX4bu7(Rg>^^+I#Sm=z@xI*&ms;UzZrqV4@pScbS?83{1OS@|)gk}@ literal 0 HcmV?d00001 diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp index 7de74470f..d2c32cf63 100644 --- a/library/LuaApi.cpp +++ b/library/LuaApi.cpp @@ -1715,6 +1715,7 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = { WRAPM(Textures, getRedPinTexposStart), WRAPM(Textures, getIconsTexposStart), WRAPM(Textures, getOnOffTexposStart), + WRAPM(Textures, getMapUnsuspendTexposStart), WRAPM(Textures, getControlPanelTexposStart), WRAPM(Textures, getThinBordersTexposStart), WRAPM(Textures, getMediumBordersTexposStart), diff --git a/library/include/modules/Textures.h b/library/include/modules/Textures.h index bebd78dc9..8032b04a5 100644 --- a/library/include/modules/Textures.h +++ b/library/include/modules/Textures.h @@ -51,6 +51,11 @@ DFHACK_EXPORT long getOnOffTexposStart(); */ DFHACK_EXPORT long getMapPathableTexposStart(); +/** + * Get the first texpos for the unsuspend 32x32 sprites. It's a 3x1 grid. + */ +DFHACK_EXPORT long getMapUnsuspendTexposStart(); + /** * Get the first texpos for the control panel icons. 10x2 grid. */ diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp index ba77f41f7..46dd0a4c5 100644 --- a/library/modules/Textures.cpp +++ b/library/modules/Textures.cpp @@ -26,6 +26,7 @@ static long g_red_pin_texpos_start = -1; static long g_icons_texpos_start = -1; static long g_on_off_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_thin_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_num_dfhack_textures += load_textures(out, "hack/data/art/pathable.png", &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_control_panel_texpos_start); 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; } +long Textures::getMapUnsuspendTexposStart() { + return g_unsuspend_texpos_start; +} + long Textures::getControlPanelTexposStart() { return g_control_panel_texpos_start; }