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

Initialize paused to false, cleanup comments

develop
Robob27 2023-02-04 14:25:27 -05:00
parent 8a08878fd6
commit c621c33b93
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/confirm.cpp
Unescape Escape View File

@ -42,9 +42,6 @@ static map<string, conf_wrapper*> confirmations;
string active_id; string active_id;
queue<string> cmds; queue<string> cmds;
// TODO: move to confirmation instance with paused_focus etc
df::viewscreen *paused_screen = NULL;
namespace DFHack { namespace DFHack {
DBG_DECLARE(confirm,status); DBG_DECLARE(confirm,status);
} }
@ -97,7 +94,8 @@ private:
std::set<VMethodInterposeLinkBase*> hooks; std::set<VMethodInterposeLinkBase*> hooks;
public: public:
conf_wrapper() conf_wrapper()
:enabled(false) :enabled(false),
paused(false)
{} {}
void add_hook(VMethodInterposeLinkBase *hook) void add_hook(VMethodInterposeLinkBase *hook)
{ {
@ -573,8 +571,14 @@ static int conf_register_##cls = conf_register(&cls##_instance, {\
IDs (used in the "confirm enable/disable" command, by Lua, and in the docs) IDs (used in the "confirm enable/disable" command, by Lua, and in the docs)
are obtained by replacing '_' with '-' in the first argument to DEFINE_CONFIRMATION are obtained by replacing '_' with '-' in the first argument to DEFINE_CONFIRMATION
TODO: document focus string stuff and how * does prefix matching The second argument to DEFINE_CONFIRMATION determines the viewscreen that any
or just add a 4th param? that's probably the move intercepted input will be fed to.
The third argument to DEFINE_CONFIRMATION determines the focus string that will
be used to determine if the confirmation should be unpaused. If a confirmation is paused
and the focus string is no longer found in the current focus, the confirmation will be
unpaused. Focus strings ending in "*" will use prefix matching e.g. "dwarfmode/Info*" would
match "dwarfmode/Info/Foo", "dwarfmode/Info/Bar" and so on. All matching is case insensitive.
*/ */
DEFINE_CONFIRMATION(trade_cancel, viewscreen_dwarfmodest, "dwarfmode/Trade"); DEFINE_CONFIRMATION(trade_cancel, viewscreen_dwarfmodest, "dwarfmode/Trade");
@ -663,11 +667,6 @@ DFhackCExport command_result plugin_onupdate (color_ostream &out)
cmds.pop(); cmds.pop();
} }
// TODO: reimplement
// if the screen that we paused on is no longer on the stack, unpause
//if (paused_focus != "" && Gui::getFocusStrings(Gui::getCurViewscreen())[0] != paused_focus)
//conf_lua::api::unpause(NULL);
return CR_OK; return CR_OK;
} }