From 4ce7d9e583f39fd03ae483a0a0d925f28cb3157d Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Thu, 20 Aug 2026 20:00:40 -0500
Subject: [PATCH 1/2] fill out `viewport_spatter_flag`

because someone has code that needs this...
---
 changelog.txt         |  1 +
 df.descriptor.xml     |  4 ----
 df.g_src.graphics.xml | 20 +++++++++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 5d3a1b54fd..de360d67b0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -20,6 +20,7 @@ Template for new versions:
 
 ## Structures
 - added support for overriding code generation for a specific type
+- added ``graphic_viewport_spatter_flag`` and related definitions
 
 # 53.16-r1
 
diff --git a/df.descriptor.xml b/df.descriptor.xml
index 587962b5d4..f8d282d5bb 100644
--- a/df.descriptor.xml
+++ b/df.descriptor.xml
@@ -208,10 +208,6 @@
         <int32_t name='texpos'/>
     </struct-type>
 
-    <bitfield-type type-name='viewport_spatter_flag' base-type='uint32_t'> TODO: defined in g_src/graphics.h
-        <flag-bit name='todo'/>
-    </bitfield-type>
-
     <struct-type type-name='spatter_graphics_infost'>
         <int64_t name='flags' original-name='local_id'/> cannot use bitfield here, since it ignores base-type
         <int32_t name='texpos'/>
diff --git a/df.g_src.graphics.xml b/df.g_src.graphics.xml
index 21bfb5de45..33d2263438 100644
--- a/df.g_src.graphics.xml
+++ b/df.g_src.graphics.xml
@@ -326,6 +326,24 @@
     -- Skipped: VIEWPORT_FLOOR_FLAG_*
     -- Unused: VIEWPORT_WALL_FLAG_*
     -- Unused: GraphicsRampType
+
+    <enum-type type-name='viewport_spatter_fire_frame_type' base-type='uint32_t'> bay12: GRAPHIC_VIEWPORT_FLAG_SPATTER_FIRE_FRAME_*
+        <enum-item name='FRAME_1' value='1'/>
+        <enum-item name='FRAME_2' value='2'/>
+        <enum-item name='FRAME_4' value='3' comment='not a typo'/>
+        <enum-item name='FRAME_3' value='4' comment='not a typo'/>
+    </enum-type>
+
+    <bitfield-type type-name='viewport_spatter_flag' base-type='uint32_t'> bay12: GRAPHIC_VIEWPORT_SPATTER_FLAG_*
+        <flag-bit name='shape_type' original-name='VIEWPORT_SPATTER_FLAG_SHAPE_TYPE' count='6'/>
+        <flag-bit name='material_type' original-name='VIEWPORT_SPATTER_FLAG_MATERIAL_TYPE' count='5'/>
+        <flag-bit name='color_index_bits' original-name='VIEWPORT_SPATTER_COLOR_INDEX_BITS' count='8'/>
+        <flag-bit count='9' comment='unused'/>
+        <flag-bit name='fire_frame_type' type-name='viewport_spatter_fire_frame_type'
+            original-name='VIEWPORT_SPATTER_FLAG_FIRE_FRAME' count='3'/>
+        <flag-bit name='accepts_spatter' original-name='VIEWPORT_SPATTER_FLAG_ACCEPTS_SPATTER'/>
+    </bitfield-type>
+
     -- Skipped: VIEWPORT_RAMP_FLAG_*
     -- Skipped: VIEWPORT_SHADOW_FLAG_*
 
@@ -349,7 +367,7 @@
         <pointer type-name='uint64_t' name='screentexpos_floor_flag' is-array='true'/> VIEWPORT_FLOOR_FLAG_*
         <pointer type-name='int32_t' name='screentexpos_background_two' is-array='true' comment='boulder, plant, etc.'/>
         <pointer type-name='uint32_t' name='screentexpos_liquid_flag' is-array='true'/> VIEWPORT_LIQUID_FLAG_*
-        <pointer type-name='uint32_t' name='screentexpos_spatter_flag' is-array='true'/> VIEWPORT_SPATTER_FLAG_*
+        <pointer type-name='viewport_spatter_flag' name='screentexpos_spatter_flag' is-array='true'/> VIEWPORT_SPATTER_FLAG_*
         <pointer type-name='int32_t' name='screentexpos_spatter' is-array='true'/>
         <pointer type-name='uint64_t' name='screentexpos_ramp_flag' is-array='true'/> VIEWPORT_RAMP_FLAG_*
         <pointer type-name='uint32_t' name='screentexpos_shadow_flag' is-array='true'/> VIEWPORT_SHADOW_FLAG_*

From 8927af47fa4fb1f9ec029854251c8071d478f2cb Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Fri, 21 Aug 2026 10:33:17 -0500
Subject: [PATCH 2/2] update based on review

---
 df.g_src.graphics.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/df.g_src.graphics.xml b/df.g_src.graphics.xml
index 33d2263438..f9cf79d385 100644
--- a/df.g_src.graphics.xml
+++ b/df.g_src.graphics.xml
@@ -327,21 +327,21 @@
     -- Unused: VIEWPORT_WALL_FLAG_*
     -- Unused: GraphicsRampType
 
-    <enum-type type-name='viewport_spatter_fire_frame_type' base-type='uint32_t'> bay12: GRAPHIC_VIEWPORT_FLAG_SPATTER_FIRE_FRAME_*
+    <enum-type type-name='viewport_spatter_flag_fire' base-type='uint32_t'> bay12: VIEWPORT_FLAG_SPATTER_FIRE_*
         <enum-item name='FRAME_1' value='1'/>
         <enum-item name='FRAME_2' value='2'/>
         <enum-item name='FRAME_4' value='3' comment='not a typo'/>
         <enum-item name='FRAME_3' value='4' comment='not a typo'/>
     </enum-type>
 
-    <bitfield-type type-name='viewport_spatter_flag' base-type='uint32_t'> bay12: GRAPHIC_VIEWPORT_SPATTER_FLAG_*
-        <flag-bit name='shape_type' original-name='VIEWPORT_SPATTER_FLAG_SHAPE_TYPE' count='6'/>
-        <flag-bit name='material_type' original-name='VIEWPORT_SPATTER_FLAG_MATERIAL_TYPE' count='5'/>
-        <flag-bit name='color_index_bits' original-name='VIEWPORT_SPATTER_COLOR_INDEX_BITS' count='8'/>
+    <bitfield-type type-name='viewport_spatter_flag' base-type='uint32_t'> bay12: VIEWPORT_SPATTER_FLAG_*
+        <flag-bit name='shape_type' original-name='SHAPE_TYPE' count='6'/>
+        <flag-bit name='material_type' original-name='MATERIAL_TYPE' count='5'/>
+        <flag-bit name='color_index_bits' original-name='COLOR_INDEX_BITS' count='8'/>
         <flag-bit count='9' comment='unused'/>
-        <flag-bit name='fire_frame_type' type-name='viewport_spatter_fire_frame_type'
-            original-name='VIEWPORT_SPATTER_FLAG_FIRE_FRAME' count='3'/>
-        <flag-bit name='accepts_spatter' original-name='VIEWPORT_SPATTER_FLAG_ACCEPTS_SPATTER'/>
+        <flag-bit name='fire_frame_type' type-name='viewport_spatter_flag_fire'
+            original-name='FIRE_FRAME' count='3'/>
+        <flag-bit name='accepts_spatter' original-name='ACCEPTS_SPATTER'/>
     </bitfield-type>
 
     -- Skipped: VIEWPORT_RAMP_FLAG_*