Merge branch 'fix-advmode-menu' into master

DFHack · Feb 17, 2015 · 7ff7938 · 7ff7938
2 parents e1151e8 + 54fa807
commit 7ff7938
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/df.advmode.xml b/df.advmode.xml
@@ -2,47 +2,56 @@
     <enum-type type-name='ui_advmode_menu' base-type='int16_t'>
         <enum-item name='Default' value='0'/>
         <enum-item name='Look'/>
-        <enum-item name='Talk'/>
+        <enum-item name='ConversationAddress'/>
+        <enum-item name='ConversationSelect'/>
+        <enum-item name='ConversationSpeak'/>
+
         <enum-item name='Inventory'/>
         <enum-item name='Drop'/>
-
         <enum-item name='ThrowItem'/>
         <enum-item name='Wear'/>
         <enum-item name='Remove'/>
+
         <enum-item name='Interact'/>
         <enum-item name='Put'/>
-
         <enum-item name='PutContainer'/>
         <enum-item name='Eat'/>
         <enum-item name='ThrowAim'/>
-        <enum-item name='Unk13'/>
-        <enum-item name='Get'/>
 
         <enum-item name='Fire'/>
+        <enum-item name='Get'/>
+        <enum-item name='Unk17'/>
         <enum-item name='CombatPrefs'/>
         <enum-item name='Companions'/>
+
         <enum-item name='MovementPrefs'/>
+        <enum-item name='SpeedPrefs'/>
         <enum-item name='InteractAction'/>
-
         <enum-item name='MoveCarefully'/>
         <enum-item name='Announcements'/>
-        <enum-item name='Attack'/>
+
         <enum-item name='UseBuilding'/>
         <enum-item name='Travel'/>
-
-        <enum-item name='Unk25'/>
-        <enum-item name='WrestleTarget'/>
         <enum-item name='Unk27'/>
         <enum-item name='Unk28'/>
-        <enum-item name='Sleep'/>
+        <enum-item name='SleepConfirm'/>
 
         <enum-item name='Unk30'/>
-        <enum-item name='AttackBodypart'/>
-        <enum-item name='AttackType'/>
-        <enum-item name='Unk33'/>
+        <enum-item name='Unk31'/>
+        <enum-item name='Unk32'/>
+        <enum-item name='FallAction'/>
         <enum-item name='Unk34'/>
 
-        <enum-item name='Unk35'/>
+        <enum-item name='Jump'/>
+        <enum-item name='Unk36'/>
+        <enum-item name='AttackConfirm'/>
+        <enum-item name='AttackType'/>
+        <enum-item name='AttackBodypart'/>
+
+        <enum-item name='AttackStrike'/>
+        <enum-item name='Unk41'/>
+        <enum-item name='Unk42'/>
+        <enum-item name='DodgeDirection'/>
     </enum-type>
 
     <struct-type type-name='conversation'>