Merge pull request #619 from quietust/master

A few updates

changelog.txt

@@ -14,6 +14,8 @@ that repo.
 # Future
 
 ## Structures
+- ``build_req_choicest``: realign structure and fix vmethods
+- ``squad_orderst``: fix vmethods
 
 # 50.09-r1
 

df.military.xml

@@ -276,7 +276,7 @@
             <vmethod name='offsetPosition'>
                 <int16_t name='x'/> <int16_t name='y'/> <int16_t name='z'/>
             </vmethod>
-            <vmethod ret-type='bool' name='process'>
+            <vmethod name='process'>
                 <int32_t/> <int32_t/> <pointer name='soldier' type-name='unit'/>
             </vmethod>
             <vmethod ret-type='squad_order_cannot_reason' name='reasonCannot'>
@@ -296,6 +296,7 @@
             <vmethod name='getDescription'> <pointer type-name='stl-string'/> </vmethod>
             <vmethod name='isInactive' ret-type='bool' comment='always false'> <int32_t/> </vmethod>
             <vmethod name='isCombat' ret-type='bool' comment='not train'/>
+            <vmethod name='isEqual' ret-type='bool'><pointer name='other' type-name='squad_order'/></vmethod>
         </virtual-methods>
     </class-type>
 

df.ui-menus.xml

@@ -27,8 +27,11 @@
     <class-type type-name='build_req_choicest'>
         <comment>One choice in the build item selector.</comment>
         <int32_t name="distance"/>
+        <bool/>
+        <stl-string/>
 
         <virtual-methods>
+            <vmethod is-destructor='true'/>
             <vmethod ret-type='build_req_choice_type' name='getType'/>
             <vmethod name='getName'>
                 <pointer type-name='stl-string' name='str'/>
@@ -41,8 +44,9 @@
             <vmethod ret-type='int32_t' name='getUsedCount'/>
             <vmethod ret-type='int32_t' name='getNumCandidates'/>
             <vmethod ret-type='bool'/>
-            <vmethod/>
-            <vmethod/>
+            <vmethod ret-type='bool' comment='get_unk1'/>
+            <vmethod comment='set_unk1'/>
+            <vmethod comment='clear_unk1'/>
         </virtual-methods>
     </class-type>
 
@@ -52,7 +56,6 @@
 
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
-        <stl-string/>
 
         <stl-vector name="candidates">
             <int32_t>
@@ -65,6 +68,7 @@
         </stl-vector>
 
         <int32_t name="used_count"/>
+        <bool name='unk_1'/>
     </class-type>
 
     <class-type type-name='build_req_choice_specst' inherits-from='build_req_choicest'>