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

Now works when enabled is true by default.

develop
Eric Wald 2013-05-31 15:30:57 -06:00
parent b9ed7a5cc2
commit 0a99bb0cae
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/stockflow.cpp
Unescape Escape View File

@ -1,6 +1,7 @@
/* /*
* Stockflow plugin. * Stockflow plugin.
* For best effect, place "stockflow enable" in your dfhack.init configuration. * For best effect, place "stockflow enable" in your dfhack.init configuration,
* or set `enabled` to true by default.
*/ */
#include "uicommon.h" #include "uicommon.h"
@ -293,6 +294,25 @@ IMPLEMENT_VMETHOD_INTERPOSE(stockflow_hook, feed);
IMPLEMENT_VMETHOD_INTERPOSE(stockflow_hook, render); IMPLEMENT_VMETHOD_INTERPOSE(stockflow_hook, render);
static bool apply_hooks(color_ostream &out, bool enabling) {
if (enabling && !gps) {
out.printerr("Stockflow needs graphics.\n");
return false;
}
if (!INTERPOSE_HOOK(stockflow_hook, feed).apply(enabling) || !INTERPOSE_HOOK(stockflow_hook, render).apply(enabling)) {
out.printerr("Could not %s stockflow hooks!\n", enabling? "insert": "remove");
return false;
}
if (!helper.reset(out, enabling && Maps::IsValid())) {
out.printerr("Could not reset stockflow world data!\n");
return false;
}
return true;
}
static command_result stockflow_cmd(color_ostream &out, vector <string> & parameters) { static command_result stockflow_cmd(color_ostream &out, vector <string> & parameters) {
bool desired = enabled; bool desired = enabled;
if (parameters.size() == 1) { if (parameters.size() == 1) {
@ -324,18 +344,7 @@ static command_result stockflow_cmd(color_ostream &out, vector <string> & parame
} }
if (desired != enabled) { if (desired != enabled) {
if (desired && !gps) { if (!apply_hooks(out, desired)) {
out.printerr("Stockflow needs graphics.\n");
return CR_FAILURE;
}
if (!INTERPOSE_HOOK(stockflow_hook, feed).apply(desired) || !INTERPOSE_HOOK(stockflow_hook, render).apply(desired)) {
out.printerr("Could not %s stockflow hooks!\n", desired? "insert": "remove");
return CR_FAILURE;
}
if (!helper.reset(out, desired && Maps::IsValid())) {
out.printerr("Could not reset stockflow world data!\n");
return CR_FAILURE; return CR_FAILURE;
} }
} }
@ -364,8 +373,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) { DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
helper.init(); helper.init();
if (enabled) apply_hooks(out, true);
commands.push_back(PluginCommand(name, tagline, stockflow_cmd, false, usage)); commands.push_back(PluginCommand(name, tagline, stockflow_cmd, false, usage));
return CR_OK; return CR_OK;
} }