convert some commented ints into actual enums

PatrikLundell · Feb 17, 2020 · 24c6060 · 24c6060
1 parent bc528c5
commit 24c6060
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/df.units.xml b/df.units.xml
@@ -1897,7 +1897,10 @@
             <compound name='attack'>
                 <int32_t name='target_unit_id' ref-target='unit'/>
                 <compound name='unk_4'>
-                    <int32_t name='wrestle_type' comment='0=wrestle, 1=grab'/>
+                    <enum name='wrestle_type' base-type='int32_t'>
+                        <enum-item name='Wrestle'/>
+                        <enum-item name='Grab'/>
+                    </enum>
                     <int16_t name='unk_4'/>
                     <int16_t name='unk_6'/>
                     <int32_t name='unk_8'/>

diff --git a/df.viewscreen.xml b/df.viewscreen.xml
@@ -482,7 +482,13 @@
                 <enum base-type='int32_t' type-name='embark_finder_option'/>
             </stl-vector>
 
-            <int16_t name="finder_state" init-value='-1' comment='0=find, 1=none, 2=partial, 3=suitable'/>
+            <enum name='finder_state' base-type='int16_t'>
+                <enum-item name='None' value='-1'/>
+                <enum-item name='Searching'/>
+                <enum-item name='NoResult'/>
+                <enum-item name='Partial'/>
+                <enum-item name='Suitable'/>
+            </enum>
 
             <int16_t name="unk_11e"/>
             <int16_t name='unk_120'/>

diff --git a/df.world.xml b/df.world.xml
@@ -67,7 +67,15 @@
         dtor 0x8C1AE10
 
         <int32_t name='id'/>
-        <int32_t name="subtype" comment='0=combat, 6=performance, others=unidentified'/>
+        <enum name='subtype' base-type='int32_t'>
+            <enum-item name='Combat'/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item name='Performance'/>
+        </enum>
 
         <stl-vector name="witnesses" type-name='int32_t' ref-target='unit'/>