More viewscreen_locationsst research

splintermind · Dec 25, 2015 · 73a4758 · 73a4758
1 parent 4820a8e
commit 73a4758
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
@@ -1262,15 +1262,29 @@
     </class-type>
 
     <class-type type-name='viewscreen_locationsst' inherits-from='viewscreen'>
-        <stl-vector/>
+        <stl-vector name='locations'/>
         <stl-vector name='dance_floor_x' type-name='int32_t'/>
         <stl-vector name='dance_floor_y' type-name='int32_t'/>
-        <stl-vector/>
+        <stl-vector type-name='int32_t'/>
         <int32_t name='location_idx'/>
-        <stl-vector name='occupations'/>
+        <stl-vector name='occupations'>
+            <pointer>
+                <int32_t/>
+                <enum name='type' base-type='int32_t'>
+                    <enum-item name='TavernKeeper'/>
+                    <enum-item name='Performer'/>
+                    <enum-item name='Scholar'/>
+                    <enum-item name='Mercenary'/>
+                    <enum-item name='MonsterSlayer'/>
+                    <enum-item name='Scribe'/>
+                </enum>
+                <int32_t/>
+                <int32_t name='unit_id'/>
+            </pointer>
+        </stl-vector>
         <int32_t name='occupation_idx'/>
         <stl-vector name='units' pointer-type='unit'/>
-        <int32_t name='unit_idx'/>
+        <int32_t name='unit_idx' comment='uninitialized'/>
         <enum base-type='int32_t' name='in_edit'>
             <enum-item name='None'/>
             <enum-item name='Goblets'/>