From 9d8a825eb4af1de095f425b4286c95186442bd18 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Mon, 15 May 2023 15:17:06 -0700
Subject: [PATCH] adjust usage to game structure reunification

---
 plugins/autolabor/autolabor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/autolabor/autolabor.cpp b/plugins/autolabor/autolabor.cpp
index 53a01a6a6..72bb4d84e 100644
--- a/plugins/autolabor/autolabor.cpp
+++ b/plugins/autolabor/autolabor.cpp
@@ -34,8 +34,8 @@
 #include <df/items_other_id.h>
 #include <df/plotinfost.h>
 #include <df/activity_info.h>
+#include <df/gamest.h>
 #include <df/global_objects.h>
-#include <df/gamest_extra.h>
 
 #include <MiscUtils.h>
 
@@ -51,7 +51,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("autolabor");
 REQUIRE_GLOBAL(plotinfo);
 REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(game_extra);
+REQUIRE_GLOBAL(game);
 
 #define ARRAY_COUNT(array) (sizeof(array)/sizeof((array)[0]))
 
@@ -414,7 +414,7 @@ static void enable_plugin(color_ostream &out)
     cleanup_state();
     init_state();
 
-    df::global::game_extra->external_flag |= 1; // shut down DF's work detail system
+    game->external_flag |= 1; // shut down DF's work detail system
 }
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
@@ -1084,7 +1084,7 @@ DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable )
         enable_autolabor = false;
         setOptionEnabled(CF_ENABLED, false);
 
-        df::global::game_extra->external_flag &= ~1; // reenable DF's work detail system
+        game->external_flag &= ~1; // reenable DF's work detail system
 
         out << "Autolabor is disabled." << std::endl;
     }