diff --git a/library/xml b/library/xml index 22d9bc0bc..9891be326 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 22d9bc0bc1847def8a6c62893104f36262e63e98 +Subproject commit 9891be32663435f2fe875e27c70010d5618de735 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 #include #include +#include #include -#include #include @@ -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 &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; }