diff --git a/library/Core.cpp b/library/Core.cpp index b480a47f2..a098073c9 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -2423,7 +2423,6 @@ bool Core::SelectHotkey(int sym, int modifiers) // TODO: understand more about this to figure out if this solution works bool found = false; std::vector focusStrings = Gui::getFocusStrings(Core::getTopViewscreen()); - // is there convention for when to use size_t vs int? for (std::string focusString : focusStrings) { if (prefix_matches(binding.focus, focusString)) { found = true; diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index f35db235d..2a5003a20 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -358,6 +358,18 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode) } } +/* TODO: understand how this changes for v50 +DEFINE_GET_FOCUS_STRING_HANDLER(dungeonmode) +{ + using df::global::adventure; + + if (!adventure) + return; + + focus += "/" + enum_item_key(adventure->menu); +} +*/ + bool Gui::matchFocusString(std::string focusString) { focusString = toLower(focusString); std::vector currentFocus = getFocusStrings(getCurViewscreen(true));