MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt autolabor to new split game structure

develop
Myk Taylor 2023-02-13 13:39:28 -08:00
parent 2fe0d8932e
commit 6202b29c56
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit 6c67ce51ab2f051bd07c5044dbbb308a375a970e Subproject commit c48cd1d9f1c9aa285ed8712c2122085c00d22c80

8
plugins/autolabor/autolabor.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
#include <df/plotinfost.h> #include <df/plotinfost.h>
#include <df/activity_info.h> #include <df/activity_info.h>
#include <df/global_objects.h> #include <df/global_objects.h>
#include <df/gamest.h> #include <df/gamest_extra.h>
#include <MiscUtils.h> #include <MiscUtils.h>
@ -51,7 +51,7 @@ using namespace df::enums;
DFHACK_PLUGIN("autolabor"); DFHACK_PLUGIN("autolabor");
REQUIRE_GLOBAL(plotinfo); REQUIRE_GLOBAL(plotinfo);
REQUIRE_GLOBAL(world); REQUIRE_GLOBAL(world);
REQUIRE_GLOBAL(game); REQUIRE_GLOBAL(game_extra);
#define ARRAY_COUNT(array) (sizeof(array)/sizeof((array)[0])) #define ARRAY_COUNT(array) (sizeof(array)/sizeof((array)[0]))
@ -414,7 +414,7 @@ static void enable_plugin(color_ostream &out)
cleanup_state(); cleanup_state();
init_state(); init_state();
df::global::game->external_flag |= 1; // shut down DF's work detail system df::global::game_extra->external_flag |= 1; // shut down DF's work detail system
} }
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands) 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; enable_autolabor = false;
setOptionEnabled(CF_ENABLED, false); setOptionEnabled(CF_ENABLED, false);
df::global::game->external_flag &= ~1; // reenable DF's work detail system df::global::game_extra->external_flag &= ~1; // reenable DF's work detail system
out << "Autolabor is disabled." << std::endl; out << "Autolabor is disabled." << std::endl;
} }