Run the update script after correcting the osx globals base.

splintermind · Dec 19, 2015 · 8548ec7 · 8548ec7
1 parent 36f94c0
commit 8548ec7
Show file tree

Hide file tree

Showing 6 changed files with 4,585 additions and 176 deletions.
diff --git a/linux/df.globals.xml b/linux/df.globals.xml
@@ -1,111 +1,111 @@
 <data-definition>
-    <global-object name="obj_9EF68B0" offset="0x9ef68b0">
+    <global-object name="obj_9EF7690" offset="0x9ef7690">
         <comment>dtor 0x804C3BC</comment>
     </global-object>
-    <global-object name="obj_93EE260" offset="0x93ee260" size="32">
+    <global-object name="obj_93EF040" offset="0x93ef040" size="32">
         <comment>dtor 0x804C93C</comment>
     </global-object>
-    <!--<global-object name="gview" offset="0x93ee280" size="1812916">
+    <!--<global-object name="gview" offset="0x93ef060" size="1812916">
         <comment>dtor 0x804C52C</comment>
     </global-object>-->
-    <!--<global-object name="flows" offset="0x95a8c34" size="12">
-        <comment>dtor 0x87EA920</comment>
+    <!--<global-object name="flows" offset="0x95a9a14" size="12">
+        <comment>dtor 0x87EB0E0</comment>
     </global-object>-->
-    <!--<global-object name="timed_events" offset="0x95a8c40" size="2144">
-        <comment>dtor 0x87EA8C0</comment>
+    <!--<global-object name="timed_events" offset="0x95a9a20" size="2144">
+        <comment>dtor 0x87EB080</comment>
     </global-object>-->
-    <!--<global-object name="ui_build_selector" offset="0x95a94a0" size="6253400">
-        <comment>dtor 0x87EBEE0</comment>
+    <!--<global-object name="ui_build_selector" offset="0x95aa280" size="6253400">
+        <comment>dtor 0x87EC6A0</comment>
     </global-object>-->
-    <global-object name="obj_9B9FFF8" offset="0x9b9fff8" size="12">
-        <comment>dtor 0x87EAFE0</comment>
+    <global-object name="obj_9BA0DD8" offset="0x9ba0dd8" size="12">
+        <comment>dtor 0x87EB7A0</comment>
     </global-object>
-    <global-object name="obj_9BA0004" offset="0x9ba0004" size="16">
-        <comment>dtor 0x87EAFE0</comment>
+    <global-object name="obj_9BA0DE4" offset="0x9ba0de4" size="16">
+        <comment>dtor 0x87EB7A0</comment>
     </global-object>
-    <global-object name="obj_9BA0014" offset="0x9ba0014" size="28">
+    <global-object name="obj_9BA0DF4" offset="0x9ba0df4" size="28">
         <comment>dtor 0x804C93C</comment>
     </global-object>
-    <!--<global-object name="ui_building_assign_type" offset="0x9ba0030" size="16">
-        <comment>dtor 0x87EAF20</comment>
+    <!--<global-object name="ui_building_assign_type" offset="0x9ba0e10" size="16">
+        <comment>dtor 0x87EB6E0</comment>
     </global-object>-->
-    <!--<global-object name="ui_building_assign_is_marked" offset="0x9ba0040" size="16">
-        <comment>dtor 0x87EAF20</comment>
+    <!--<global-object name="ui_building_assign_is_marked" offset="0x9ba0e20" size="16">
+        <comment>dtor 0x87EB6E0</comment>
     </global-object>-->
-    <!--<global-object name="ui_building_assign_units" offset="0x9ba0050" size="16">
-        <comment>dtor 0x87EAD80</comment>
+    <!--<global-object name="ui_building_assign_units" offset="0x9ba0e30" size="16">
+        <comment>dtor 0x87EB540</comment>
     </global-object>-->
-    <!--<global-object name="ui_building_assign_items" offset="0x9ba0060" size="12">
-        <comment>dtor 0x87EABF0</comment>
+    <!--<global-object name="ui_building_assign_items" offset="0x9ba0e40" size="12">
+        <comment>dtor 0x87EB3B0</comment>
     </global-object>-->
-    <global-object name="obj_9BA006C" offset="0x9ba006c" size="12">
-        <comment>dtor 0x87EAAA0</comment>
+    <global-object name="obj_9BA0E4C" offset="0x9ba0e4c" size="12">
+        <comment>dtor 0x87EB260</comment>
     </global-object>
-    <global-object name="obj_9BA0078" offset="0x9ba0078" size="12">
-        <comment>dtor 0x87EAF50</comment>
+    <global-object name="obj_9BA0E58" offset="0x9ba0e58" size="12">
+        <comment>dtor 0x87EB710</comment>
     </global-object>
-    <global-object name="obj_9BA0084" offset="0x9ba0084" size="124">
-        <comment>dtor 0x87EAF50</comment>
+    <global-object name="obj_9BA0E64" offset="0x9ba0e64" size="124">
+        <comment>dtor 0x87EB710</comment>
     </global-object>
-    <!--<global-object name="created_item_type" offset="0x9ba0100" size="16">
-        <comment>dtor 0x87EAF50</comment>
+    <!--<global-object name="created_item_type" offset="0x9ba0ee0" size="16">
+        <comment>dtor 0x87EB710</comment>
     </global-object>-->
-    <!--<global-object name="created_item_subtype" offset="0x9ba0110" size="16">
-        <comment>dtor 0x87EAF50</comment>
+    <!--<global-object name="created_item_subtype" offset="0x9ba0ef0" size="16">
+        <comment>dtor 0x87EB710</comment>
     </global-object>-->
-    <!--<global-object name="created_item_mattype" offset="0x9ba0120" size="16">
-        <comment>dtor 0x87EAF50</comment>
+    <!--<global-object name="created_item_mattype" offset="0x9ba0f00" size="16">
+        <comment>dtor 0x87EB710</comment>
     </global-object>-->
-    <!--<global-object name="created_item_matindex" offset="0x9ba0130" size="16">
-        <comment>dtor 0x87EAF50</comment>
+    <!--<global-object name="created_item_matindex" offset="0x9ba0f10" size="16">
+        <comment>dtor 0x87EB710</comment>
     </global-object>-->
-    <!--<global-object name="created_item_count" offset="0x9ba0140" size="32">
-        <comment>dtor 0x87EAFE0</comment>
+    <!--<global-object name="created_item_count" offset="0x9ba0f20" size="32">
+        <comment>dtor 0x87EB7A0</comment>
     </global-object>-->
-    <!--<global-object name="ui" offset="0x9ba0160" size="28544">
-        <comment>dtor 0x87FBF90</comment>
+    <!--<global-object name="ui" offset="0x9ba0f40" size="28544">
+        <comment>dtor 0x87FC750</comment>
     </global-object>-->
-    <!--<global-object name="ui_advmode" offset="0x9ba70e0" size="15968">
-        <comment>dtor 0x87FDF70</comment>
+    <!--<global-object name="ui_advmode" offset="0x9ba7ec0" size="15968">
+        <comment>dtor 0x87FE730</comment>
     </global-object>-->
-    <!--<global-object name="world" offset="0x9baaf40" size="2458112">
-        <comment>dtor 0x8ECB6D0</comment>
+    <!--<global-object name="world" offset="0x9babd20" size="2458112">
+        <comment>dtor 0x8ECD1F0</comment>
     </global-object>-->
-    <!--<global-object name="ui_sidebar_menus" offset="0x9e03140" size="6304">
-        <comment>dtor 0x87FEA90</comment>
+    <!--<global-object name="ui_sidebar_menus" offset="0x9e03f20" size="6304">
+        <comment>dtor 0x87FF280</comment>
     </global-object>-->
-    <!--<global-object name="map_renderer" offset="0x9e049e0" size="74112">
-        <comment>dtor 0x87EADB0</comment>
+    <!--<global-object name="map_renderer" offset="0x9e057c0" size="74112">
+        <comment>dtor 0x87EB570</comment>
     </global-object>-->
-    <!--<global-object name="texture" offset="0x9e16b60" size="64">
-        <comment>dtor 0x87F0D40</comment>
+    <!--<global-object name="texture" offset="0x9e17940" size="64">
+        <comment>dtor 0x87F1500</comment>
     </global-object>-->
-    <!--<global-object name="init" offset="0x9e16ba0" size="4256">
-        <comment>dtor 0x87EAAD0</comment>
+    <!--<global-object name="init" offset="0x9e17980" size="4256">
+        <comment>dtor 0x87EB290</comment>
     </global-object>-->
-    <!--<global-object name="d_init" offset="0x9e17c40" size="526560">
-        <comment>dtor 0x87EAB60</comment>
+    <!--<global-object name="d_init" offset="0x9e18a20" size="526560">
+        <comment>dtor 0x87EB320</comment>
     </global-object>-->
-    <!--<global-object name="ui_look_list" offset="0x9e98520" size="44">
-        <comment>dtor 0x87EA8F0</comment>
+    <!--<global-object name="ui_look_list" offset="0x9e99300" size="44">
+        <comment>dtor 0x87EB0B0</comment>
     </global-object>-->
-    <global-object name="obj_9E9854C" offset="0x9e9854c" size="12">
-        <comment>dtor 0x87EABF0</comment>
+    <global-object name="obj_9E9932C" offset="0x9e9932c" size="12">
+        <comment>dtor 0x87EB3B0</comment>
     </global-object>
-    <global-object name="obj_9E98558" offset="0x9e98558" size="12">
-        <comment>dtor 0x87EA950</comment>
+    <global-object name="obj_9E99338" offset="0x9e99338" size="12">
+        <comment>dtor 0x87EB110</comment>
     </global-object>
-    <global-object name="obj_9E98564" offset="0x9e98564" size="12">
-        <comment>dtor 0x87EAFE0</comment>
+    <global-object name="obj_9E99344" offset="0x9e99344" size="12">
+        <comment>dtor 0x87EB7A0</comment>
     </global-object>
-    <global-object name="obj_9E98570" offset="0x9e98570" size="12">
-        <comment>dtor 0x87EAFE0</comment>
+    <global-object name="obj_9E99350" offset="0x9e99350" size="12">
+        <comment>dtor 0x87EB7A0</comment>
     </global-object>
-    <global-object name="obj_9E9857C" offset="0x9e9857c" size="20">
-        <comment>dtor 0x87EAFE0</comment>
+    <global-object name="obj_9E9935C" offset="0x9e9935c" size="20">
+        <comment>dtor 0x87EB7A0</comment>
     </global-object>
-    <global-object name="obj_9E98590" offset="0x9e98590" size="385824">
-        <comment>dtor 0x87EAD80</comment>
+    <global-object name="obj_9E99370" offset="0x9e99370" size="385824">
+        <comment>dtor 0x87EB540</comment>
     </global-object>
 </data-definition>
 

diff --git a/osx/ctors-base.txt b/osx/ctors-base.txt
@@ -85,13 +85,7 @@
 <global-object name="obj_1B5C880" offset="0x1b5c880" size="12">
     <comment>ctorlist="sub_7364e0h" callsite="0x737710" </comment>
 </global-object>
-<global-object name="obj_1B5C88C" offset="0x1b5c88c" size="12">
-    <comment>ctorlist="sub_7364e0h" callsite="0x737744" </comment>
-</global-object>
-<global-object name="obj_1B5C898" offset="0x1b5c898" size="12">
-    <comment>ctorlist="sub_7364e0h" callsite="0x737778" </comment>
-</global-object>
-<global-object name="obj_1B5C8B8" offset="0x1b5c8b8" size="225372">
+<global-object name="obj_1B5C8B8" offset="0x1b5c8b8" size="225396">
     <comment>ctorlist="sub_7364e0h" callsite="0x7377e4" </comment>
 </global-object>
 <global-object name="enabler" offset="0x1b938e0" size="2560">
@@ -109,7 +103,7 @@
 <global-object name="obj_1B981C0" offset="0x1b981c0" size="64">
     <comment>ctorlist="sub_f5d5d0h" callsite="0xf5d6c2" </comment>
 </global-object>
-<global-object name="obj_1B98200" offset="0x1b98200" size="3883900">
+<global-object name="obj_1B98200" offset="0x1b98200" size="3884124">
     <comment>ctorlist="sub_f5d5d0h" callsite="0xf5d738" </comment>
 </global-object>
 <global-object name="obj_1F3813C" offset="0x1f3813c" size="24">