move filtering of armok keybindings into cpp #4674
Conversation
| void Core::setMortalMode(bool value) { | ||
| mortal_mode = value; | ||
| } | ||
|
|
||
| void Core::setArmokTools(const std::vector<std::string> &tool_names) { | ||
| armok_tools.clear(); | ||
| armok_tools.insert(tool_names.begin(), tool_names.end()); | ||
| } | ||
|
|
There was a problem hiding this comment.
There should be a mutex guarding all of these accesses (not exclusive to these two functions) because SelectHotkey is called from the input thread. (I haven't looked to see if there is an existing appropriate mutex)
| dfhack.HIDE_CONSOLE_ON_STARTUP = value | ||
| end | ||
|
|
||
| dfhack.HIDE_ARMOK_TOOLS = false |
There was a problem hiding this comment.
is this intended to be publicly accessible? If not, I would make it local instead of a member of dfhack. If you do want it publicly accessible, you should be aware that it is possible to set this variable without calling setMortalMode(), which would lead to an inconsistent state.
Same goes for HIDE_CONSOLE_ON_STARTUP, although I think the effects are more limited.
There was a problem hiding this comment.
it was intended to be publicly accessible, but this change makes it unwise to access directly. Now that I've removed references to it (gui/control-panel, docs), it's good to make it local. will make that change.
There was a problem hiding this comment.
right - I knew it was previously public - was meaning to ask "is this still intended"
2 participants
fixes poor execution of #4664