Merge branch 'master' of github.com:DFHack/df-structures

angavrilov · Apr 3, 2015 · d0ea0db · d0ea0db
2 parents f5b09ca + c42e4d1
commit d0ea0db
Show file tree

Hide file tree

Showing 29 changed files with 96 additions and 86 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'>
@@ -405,8 +414,8 @@
                     <pointer name="choice" type-name='talk_choice'/>
                     <stl-vector name="keywords" pointer-type='stl-string'/>
                     <stl-vector name="title" pointer-type='stl-string'/>
-                    <int32_t name="unk_1c"/>
-                    <int32_t name="unk_20"/>
+                    <int32_t name="orig_index"/>
+                    <int32_t name="ranking"/>
                 </pointer>
             </stl-vector>
             <stl-string name='filter'/>

diff --git a/df.buildings.xml b/df.buildings.xml
@@ -739,7 +739,7 @@
     </struct-type>
 
     <class-type type-name='building_bedst' inherits-from='building_actual'>
-        <bitfield base-type='uint16_t'>
+        <bitfield name='bed_flags' base-type='uint16_t'>
             <flag-bit name='barracks'/>
             <flag-bit name='dormitory'/>
         </bitfield>

diff --git a/df.entities.xml b/df.entities.xml
@@ -104,8 +104,10 @@
         <stl-vector name="item_subtype" comment='guess'>
             <int16_t refers-to='(item-subtype-target $$._global.item_type[$$._key] $)'/>
         </stl-vector>
-        <stl-vector name="unk_20" type-name='int16_t'/>
-        <stl-vector name="unk_30" type-name='int16_t'/>
+        <stl-vector name='mat_types'>
+            <int16_t ref-target='material' aux-value='$$._parent.mat_indices[$._key]'/>
+        </stl-vector>
+        <stl-vector name='mat_indices' type-name='int16_t'/>
         <stl-vector name="mat_cats" type-name='job_material_category'/>
         <stl-vector type-name='int8_t' name='priority'/>
     </struct-type>

diff --git a/df.graphics.xml b/df.graphics.xml
@@ -79,7 +79,7 @@
         <enum-item name='zoom_resetgrid'/>
     </enum-type>
 
-    <struct-type type-name='enabler'>
+    <struct-type type-name='enabler' custom-methods='true'>
         <bool name='fullscreen'/>
 
         <stl-deque name='overridden_grid_sizes'>

diff --git a/df.history.xml b/df.history.xml
@@ -1293,7 +1293,7 @@
         <int32_t name='doer' ref-target='historical_figure'/>
         <int32_t name='target' ref-target='historical_figure'/>
         <int32_t name='interaction' ref-target='interaction'/>
-        <int32_t/>
+        <int32_t name='source' ref-target='interaction_source' aux-value='$$.interaction'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>

diff --git a/df.jobs.xml b/df.jobs.xml
@@ -334,9 +334,8 @@
 
     <struct-type type-name='manager_order'>
         <enum name='job_type' base-type='int16_t' type-name='job_type'/>
-        <int16_t name="unk_2"/>
-
-        <int16_t name="item_subtype"/>
+        <enum base-type='int16_t' name='item_type' type-name='item_type'/>
+        <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
 
         <stl-string name="reaction_name"/>
 
@@ -355,12 +354,12 @@
     <struct-type type-name='manager_order_template'>
         <enum name='job_type' base-type='int16_t' type-name='job_type'/>
         <stl-string name="reaction_name"/>
-        <int16_t init-value='-1'/>
-        <int16_t name="item_subtype"/>
+        <enum base-type='int16_t' name='item_type' type-name='item_type' init-value='NONE'/>
+        <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name="mat_index"/>
         <compound name="item_category" type-name='stockpile_group_set'/>
-        <int32_t init-value='-1'/>
+        <int32_t name="hist_figure_id" ref-target='historical_figure' init-value='-1'/>
         <compound name="material_category" type-name='job_material_category'/>
         <int8_t init-value='1'/>
     </struct-type>

diff --git a/df.tile-types.xml b/df.tile-types.xml
@@ -4448,4 +4448,4 @@ Local Variables:
 indent-tabs-mode: nil
 nxml-child-indent: 4
 End:
--->
+-->
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
@@ -1366,7 +1366,7 @@
         <int32_t ref-target='historical_entity' name='civ_id'/>
         <int32_t name='cursor'/>
         <static-string size='256' name='title'/>
-        <pointer type-name='historical_entity'/>
+        <pointer type-name='historical_entity' name='civ'/>
     </class-type>
 
     <class-type type-name='viewscreen_savegamest' inherits-from='viewscreen'>
@@ -1636,17 +1636,17 @@
         <int32_t name="unk_28"/>
     </class-type>
 
-    <class-type type-name='viewscreen_topicmeeting_fill_land_holder_positionst' inherits-from='viewscreen'>
-        <static-string size='256'/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <int32_t/>
+    <class-type type-name='viewscreen_topicmeeting_fill_land_holder_positionsst' inherits-from='viewscreen'>
+        <static-string size='256' name='title'/>
+        <pointer name='popup' type-name='dipscript_popup'/>
+        <pointer name='meeting' type-name='meeting_diplomat_info'/>
+        <pointer name='entity_diplomat' type-name='historical_entity'/>
+        <pointer name='entity_fortress' type-name='historical_entity'/>
+        <stl-vector name="position_ids" type-name='int32_t' ref-target='entity_position_raw'/>
+        <stl-vector name="selected_histfig_ids" type-name='int32_t' ref-target='historical_figure'/>
+        <stl-vector name="candidate_histfig_ids" type-name='int32_t' ref-target='historical_figure'/>
+        <int32_t name='position_cursor'/>
+        <int32_t name='cursor'/>
         <int32_t/>
     </class-type>
 

diff --git a/linux/all.csv b/linux/all.csv
@@ -26347,19 +26347,19 @@
 "viewscreen_titlest","1","0x290","0x4","int32_t","unk_398","","unset"
 "viewscreen_titlest","1","0x294","0x1","int8_t","unk_39c","",""
 "viewscreen_titlest","1","0x298","0x4","int32_t","unk_3a0","","unset"
-"viewscreen_topicmeeting_fill_land_holder_positionst","0","0x0","0x158","class-type","viewscreen_topicmeeting_fill_land_holder_positionst","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x0","0x10","viewscreen","","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0xe","0x100","static-string","","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x110","0x4","int32_t","","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x114","0x4","int32_t","","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x118","0x4","int32_t","","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x11c","0x4","int32_t","","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x120","0xc","stl-vector","","padding",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x12c","0xc","stl-vector","","padding",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x138","0xc","stl-vector","","padding",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x144","0xc","stl-vector","","padding",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x150","0x4","int32_t","","",""
-"viewscreen_topicmeeting_fill_land_holder_positionst","1","0x154","0x4","int32_t","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","0","0x0","0x158","class-type","viewscreen_topicmeeting_fill_land_holder_positionsst","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x0","0x10","viewscreen","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0xe","0x100","static-string","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x110","0x4","int32_t","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x114","0x4","int32_t","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x118","0x4","int32_t","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x11c","0x4","int32_t","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x120","0xc","stl-vector","","padding",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x12c","0xc","stl-vector","","padding",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x138","0xc","stl-vector","","padding",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x144","0xc","stl-vector","","padding",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x150","0x4","int32_t","","",""
+"viewscreen_topicmeeting_fill_land_holder_positionsst","1","0x154","0x4","int32_t","","",""
 "viewscreen_topicmeeting_takerequestsst","0","0x0","0x12c","class-type","viewscreen_topicmeeting_takerequestsst","",""
 "viewscreen_topicmeeting_takerequestsst","1","0x0","0x10","viewscreen","","",""
 "viewscreen_topicmeeting_takerequestsst","1","0xe","0x100","static-string","title","",""

diff --git a/symbols.xml b/symbols.xml
@@ -214,7 +214,7 @@
 
         code
 
-        <global-address name='start_dwarf_count'/>
+        <global-address name='start_dwarf_count' value='0xB4C833'/>
 
         generated standingorders
 

diff --git a/v0.40.01.lst b/v0.40.01.lst
@@ -1195,7 +1195,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :ALIGNED
 "viewscreen_titlest" :STATUS :ALIGNED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :VERIFIED
 "viewscreen_topicmeetingst" :STATUS :VERIFIED
 "viewscreen_tradeagreementst" :STATUS :VERIFIED

diff --git a/v0.40.04.lst b/v0.40.04.lst
@@ -1227,7 +1227,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.05.lst b/v0.40.05.lst
@@ -1231,7 +1231,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :VERIFIED
 "viewscreen_titlest" :STATUS :VERIFIED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.06.lst b/v0.40.06.lst
@@ -1231,7 +1231,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.07.lst b/v0.40.07.lst
@@ -1260,7 +1260,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.08.lst b/v0.40.08.lst
@@ -1261,7 +1261,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.09.lst b/v0.40.09.lst
@@ -1261,7 +1261,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.10.lst b/v0.40.10.lst
@@ -1266,7 +1266,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.11.lst b/v0.40.11.lst
@@ -1264,7 +1264,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.12.lst b/v0.40.12.lst
@@ -1264,7 +1264,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.13.lst b/v0.40.13.lst
@@ -1266,7 +1266,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :VERIFIED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.14.lst b/v0.40.14.lst
@@ -1268,7 +1268,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.15.lst b/v0.40.15.lst
@@ -1266,7 +1266,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.16.lst b/v0.40.16.lst
@@ -1264,7 +1264,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.19.lst b/v0.40.19.lst
@@ -1270,7 +1270,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.20.lst b/v0.40.20.lst
@@ -1270,7 +1270,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.23.lst b/v0.40.23.lst
@@ -1270,7 +1270,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED

diff --git a/v0.40.24.lst b/v0.40.24.lst
@@ -1264,7 +1264,7 @@
 "viewscreen_textviewerst.formatted_text.*.*" :STATUS :UNCHECKED
 "viewscreen_titlest" :STATUS :UNCHECKED
 "viewscreen_titlest.sel_subpage" :STATUS :UNCHECKED
-"viewscreen_topicmeeting_fill_land_holder_positionst" :STATUS :UNCHECKED
+"viewscreen_topicmeeting_fill_land_holder_positionsst" :STATUS :UNCHECKED
 "viewscreen_topicmeeting_takerequestsst" :STATUS :UNCHECKED
 "viewscreen_topicmeetingst" :STATUS :UNCHECKED
 "viewscreen_tradeagreementst" :STATUS :UNCHECKED