rename duplicate inherited field names

DFHack · Jul 4, 2012 · eb6f706 · eb6f706
1 parent a08a442
commit eb6f706
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/df.buildings.xml b/df.buildings.xml
@@ -844,7 +844,7 @@
     </class-type>
 
     <class-type type-name='building_doorst' inherits-from='building_actual'>
-        <compound name='flags' type-name='door_flags' init-value='0x50'/>
+        <compound name='door_flags' type-name='door_flags' init-value='0x50'/>
         <int16_t name='close_timer'/>
     </class-type>
 
@@ -876,7 +876,7 @@
     </class-type>
 
     <class-type type-name='building_hatchst' inherits-from='building_actual'>
-        <compound name='flags' type-name='door_flags' init-value='0x50'/>
+        <compound name='door_flags' type-name='door_flags' init-value='0x50'/>
         <int16_t name='close_timer'/>
     </class-type>
 
@@ -916,8 +916,8 @@
 
     <class-type type-name='building_shopst' inherits-from='building_actual'>
         <int32_t name='has_owner'/>
-        <int32_t name='owner' comment='type uncertain - not a unit ID or unit pointer'/>
-        <bitfield name='flags' base-type='int16_t' init-value='1'>
+        <int32_t name='shop_owner' comment='type uncertain - not a unit ID or unit pointer'/>
+        <bitfield name='shop_flags' base-type='int16_t' init-value='1'>
             <flag-bit name='for_sale'/>
         </bitfield>
         <enum base-type='int16_t' name="type" type-name='shop_type'/>
@@ -958,7 +958,7 @@
     </class-type>
 
     <class-type type-name='building_tablest' inherits-from='building_actual'>
-        <bitfield name='flags' base-type='int16_t'>
+        <bitfield name='table_flags' base-type='int16_t'>
             <flag-bit name='meeting_hall'/>
         </bitfield>
         <compound name='users' type-name='building_users'/>
@@ -970,7 +970,7 @@
     </class-type>
 
     <class-type type-name='building_tradedepotst' inherits-from='building_actual'>
-        <bitfield name='flags' base-type='uint32_t'>
+        <bitfield name='trade_flags' base-type='uint32_t'>
             <flag-bit name='trader_requested'/>
             <flag-bit name='anyone_can_trade'/>
         </bitfield>
@@ -1058,7 +1058,7 @@
     </class-type>
 
     <class-type type-name='building_wellst' inherits-from='building_actual'>
-        <bitfield name='flags' base-type='int16_t'>
+        <bitfield name='well_flags' base-type='int16_t'>
             <flag-bit name='lowering'/>
         </bitfield>
         <int8_t/>

diff --git a/df.history.xml b/df.history.xml
@@ -604,7 +604,7 @@
         <int32_t name='source' ref-target='historical_entity'/>
         <int32_t name='destination' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
-        <df-flagarray name='flags'/>
+        <df-flagarray name='flags2'/>
     </class-type>
 
     <class-type type-name='history_event_artifact_hiddenst' inherits-from='history_event'>
@@ -626,7 +626,7 @@
         <int32_t name='unit_id' ref-target='unit'/>
         <int32_t name='hfid' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
-        <uint32_t name='flags' comment='1 = was named, not created'/>
+        <uint32_t name='flags2' comment='1 = was named, not created'/>
     </class-type>
 
     <class-type type-name='history_event_artifact_lostst' inherits-from='history_event'>
@@ -653,7 +653,7 @@
         <int32_t name='unit' ref-target='unit'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
-        <df-flagarray name='flags'/> 1=due to injury
+        <df-flagarray name='flags2'/> 1=due to injury
     </class-type>
 
     <class-type type-name='history_event_reclaim_sitest' inherits-from='history_event'>