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 zcmeHKc~BEs8gB^5>B-EfqevS^1es1cCrJ+>V!{z5h#?@(>S8C|fktweG$f!1;<$r| zif4^Cj*g5M9(b+?2(i>rkzIFm$^#r26&!C@L1mnM2?$s_Ra;i={70%f{f^)Fd*Ao_ zzW1u%qJ;S9{@$N@LlD$o5hGWD_e}7>p8df8!|FUWc-eE+DYOc=!X~p(M`e;QonsEsvo^6DV3?BP4k1khJowWu)q;PjFQqiQf8Wo_fB zk|tfN{|lSX)=#2pWM!ynSvh~#wQ;-WY{IqQ#b;P=bP=X2I)!$1Fat4r&o z6{14dK+ebqo0}8dcdbHeC%nDXD$iv!R!#fl7fr)W2y*#~lF1SjGTFO$KolGDmP=x4 zCyYFk`j-f8+-=5$4r^QkQY; zhjneguzl|wTuoM785!ZaIHl0jg}XCoi?7d=F9oW&ZRyfSKL?mQn8yh7>gsd*3%u1a zO9MIv&a=+CTON38Tf)eex%(e3n*ty8;b$EFEid!N5 z>_OHttMy3R%g1YV`O@uE%*SJQCGtVt*(gw7DatrZYt*xF!l)rxHoXZH9t4F+Z6;hh zi=<%l+ge? zIB|_Ji<(wpWdWYcGDXyT`B-Q*f!k6=CDwd8T!I~z-P202od}%9#DI6b<`_1!r22c;n5aCrhD0cwa(>JUDO>JTw01o`9gKw`xrkiSlm zy4fv89c{(UWJDU!5oiU<)2S64ldDgz4^rTRziWOQ<=u0gA`Rdx$OqsGauJ#SKTkZVLM7#{P{0#V&s@ugH+eVa8zr6w|&ocUtLMBn=Mxh{*ns(Aa(->h%1con^cO;2Aw zb-Rfu+;lN;Jp=Mq)y@pW9Y^KkW;@7T?W34SFQd$x{a5PoMwpJEAK1)a4Gw z;gg>~JypeSoHA3jr{cB!e#qWxw>Qr=ZcN1=T-uAi9Az!ov=v_1KR($nv&m?h7*V{s zktkHoO`RuXTsMSP>>eM3ub;dm@Ed#M-76W-^xVq2s@l`(g^CXU0Sz6elS&_t-rX!Z zy#4j~IV>pzRd($Ea&55v$W!UhE)aV5ntOgpyW&E9b8*UL_w`;_h-wjFuPYw*bmj1B z90j5c|grt#*V3}^Ur4;(gY8FQztF@`1dut?8zC1=Q|Ez zP5jfz8IMf+lA|*_Zr;-S=AW!p-zim#Pqf5d`zGn~dhF`qjZpmLBt(G2-@+#?MxrcN;KoWqaVfm0tO;$Jdnqi=TBdcxH$|>0jBF^XV0@#`}YW zGamoFxS+m0{7Kt&C{ggVG5nl7&u>lCBxlOzPpBWz_=A6J6jC{Pl%swWk@511i8BlT E1DgodA^-pY 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; }