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

Fixup focusStrings->focusString

develop
Robob27 2023-02-02 01:44:04 -05:00
parent 0c80eff087
commit 8f32f1ed7b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/include/modules/Screen.h
Unescape Escape View File

@ -351,7 +351,7 @@ namespace DFHack
virtual bool is_lua_screen() { return false; } virtual bool is_lua_screen() { return false; }
virtual std::string getFocusStrings() = 0; virtual std::string getFocusString() = 0;
virtual void onShow() {}; virtual void onShow() {};
virtual void onDismiss() {}; virtual void onDismiss() {};
virtual df::unit *getSelectedUnit() { return nullptr; } virtual df::unit *getSelectedUnit() { return nullptr; }
@ -384,7 +384,7 @@ namespace DFHack
static df::viewscreen *get_pointer(lua_State *L, int idx, bool make); static df::viewscreen *get_pointer(lua_State *L, int idx, bool make);
virtual bool is_lua_screen() { return true; } virtual bool is_lua_screen() { return true; }
virtual std::string getFocusStrings() { return focus; } virtual std::string getFocusString() { return focus; }
virtual void render(); virtual void render();
virtual void logic(); virtual void logic();

2
library/modules/Gui.cpp
Unescape Escape View File

@ -388,7 +388,7 @@ std::vector<std::string> Gui::getFocusStrings(df::viewscreen* top)
if (dfhack_viewscreen::is_instance(top)) if (dfhack_viewscreen::is_instance(top))
{ {
auto name = static_cast<dfhack_viewscreen*>(top)->getFocusStrings(); auto name = static_cast<dfhack_viewscreen*>(top)->getFocusString();
focusStrings.push_back(name.empty() ? "dfhack" : "dfhack/" + name); focusStrings.push_back(name.empty() ? "dfhack" : "dfhack/" + name);
} }
else if (virtual_identity *id = virtual_identity::get(top)) else if (virtual_identity *id = virtual_identity::get(top))