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

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;
+}