From ac06508d92ec9bc7f52ceb819894d46c3107f42b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Thu, 12 Jan 2023 14:42:40 -0800
Subject: [PATCH] add some more icon textures we can use

contributed by TaxiService on the DFHack Discord server
---
 data/art/icons.png                 | Bin 0 -> 2026 bytes
 library/include/modules/Textures.h |   8 +++++++-
 library/modules/Textures.cpp       |   7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 data/art/icons.png

diff --git a/data/art/icons.png b/data/art/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..141d9f79f4004fc1417346adbcfae25aee34df50
GIT binary patch
literal 2026
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
WSykTcj~`qAzC3Oir#vYB%YOsl(pV1w

literal 0
HcmV?d00001

diff --git a/library/include/modules/Textures.h b/library/include/modules/Textures.h
index e088ce477..e3e5a8ec0 100644
--- a/library/include/modules/Textures.h
+++ b/library/include/modules/Textures.h
@@ -31,9 +31,15 @@ void cleanup();
 DFHACK_EXPORT long getDfhackLogoTexposStart();
 
 /**
- * Get the texpos for the UI pin tiles. Each are 2x2 grids.
+ * Get the first texpos for the UI pin tiles. Each are 2x2 grids.
  */
 DFHACK_EXPORT long getGreenPinTexposStart();
 DFHACK_EXPORT long getRedPinTexposStart();
+
+/**
+ * Get the first texpos for the DFHack icons. It's a 5x2 grid.
+ */
+DFHACK_EXPORT long getIconsTexposStart();
+
 }
 }
diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp
index 3ae8658c8..78ed53d97 100644
--- a/library/modules/Textures.cpp
+++ b/library/modules/Textures.cpp
@@ -21,6 +21,7 @@ static long g_num_dfhack_textures = 0;
 static long g_dfhack_logo_texpos_start = -1;
 static long g_green_pin_texpos_start = -1;
 static long g_red_pin_texpos_start = -1;
+static long g_icons_texpos_start = -1;
 
 // Converts an arbitrary Surface to something like the display format
 // (32-bit RGBA), and converts magenta to transparency if convert_magenta is set
@@ -117,6 +118,8 @@ void Textures::init(color_ostream &out) {
                                           &g_green_pin_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/red-pin.png",
                                           &g_red_pin_texpos_start);
+    g_num_dfhack_textures += load_textures(out, "hack/data/art/icons.png",
+                                          &g_icons_texpos_start);
 
     DEBUG(textures,out).print("loaded %ld textures\n", g_num_dfhack_textures);
 
@@ -160,3 +163,7 @@ long Textures::getGreenPinTexposStart() {
 long Textures::getRedPinTexposStart() {
     return g_red_pin_texpos_start;
 }
+
+long Textures::getIconsTexposStart() {
+    return g_icons_texpos_start;
+}