Merge pull request #596 from DFHack/50.08

merge 50.08 changes
DFHack · Apr 30, 2023 · 113f5e4 · 113f5e4
2 parents ae26895 + d1e655f
commit 113f5e4
Show file tree

Hide file tree

Showing 3 changed files with 985 additions and 2,912 deletions.
diff --git a/df.raws.xml b/df.raws.xml
@@ -152,6 +152,7 @@
             <stl-vector/> 0.50.01
             <stl-vector/> 0.50.01
             <stl-vector/> 0.50.01
+            <stl-vector/> 0.50.08-beta
         </compound>
 
         -- Reaction RAWs

diff --git a/df.ui-menus.xml b/df.ui-menus.xml
@@ -2539,24 +2539,26 @@
         <bool name='mod_upload_completed'/>
         <int32_t name='uploading_mod_index'/>
 
-        -- NOTE: this is going to become a Pointer
-        <compound name='CreateItemResult'>
-            <pointer name='vftable'/>
-            <uint8_t name='m_nCallbackFlags'/>
-            <int32_t name='m_iCallback'/>
-            <uint64_t name='m_hAPICall'/>
-            <pointer name='m_pObj' comment='mod_managerst'/>
-            <pointer name='m_Func'/>
-        </compound>
-        -- NOTE: this is going to become a Pointer
-        <compound name='SubmitItemUpdateResult'>
-            <pointer name='vftable'/>
-            <uint8_t name='m_nCallbackFlags'/>
-            <int32_t name='m_iCallback'/>
-            <uint64_t name='m_hAPICall'/>
-            <pointer name='m_pObj' comment='mod_managerst'/>
-            <pointer name='m_Func'/>
-        </compound>
+        <pointer name='CreateItemResult'>
+            <compound>
+                <pointer name='vftable'/>
+                <uint8_t name='m_nCallbackFlags'/>
+                <int32_t name='m_iCallback'/>
+                <uint64_t name='m_hAPICall'/>
+                <pointer name='m_pObj' comment='mod_managerst'/>
+                <pointer name='m_Func'/>
+            </compound>
+        </pointer>
+        <pointer name='SubmitItemUpdateResult'>
+            <compound>
+                <pointer name='vftable'/>
+                <uint8_t name='m_nCallbackFlags'/>
+                <int32_t name='m_iCallback'/>
+                <uint64_t name='m_hAPICall'/>
+                <pointer name='m_pObj' comment='mod_managerst'/>
+                <pointer name='m_Func'/>
+            </compound>
+        </pointer>
         -- End Steam-only stuff
     </struct-type>