From 8f32f1ed7ba30d5b8e1426e9182e02b693d111ef Mon Sep 17 00:00:00 2001 From: Robob27 Date: Thu, 2 Feb 2023 01:44:04 -0500 Subject: [PATCH] Fixup focusStrings->focusString --- library/include/modules/Screen.h | 4 ++-- library/modules/Gui.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/include/modules/Screen.h b/library/include/modules/Screen.h index c4fa48f08..0f0afd6e2 100644 --- a/library/include/modules/Screen.h +++ b/library/include/modules/Screen.h @@ -351,7 +351,7 @@ namespace DFHack virtual bool is_lua_screen() { return false; } - virtual std::string getFocusStrings() = 0; + virtual std::string getFocusString() = 0; virtual void onShow() {}; virtual void onDismiss() {}; virtual df::unit *getSelectedUnit() { return nullptr; } @@ -384,7 +384,7 @@ namespace DFHack static df::viewscreen *get_pointer(lua_State *L, int idx, bool make); virtual bool is_lua_screen() { return true; } - virtual std::string getFocusStrings() { return focus; } + virtual std::string getFocusString() { return focus; } virtual void render(); virtual void logic(); diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index 2a5003a20..a52453647 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -388,7 +388,7 @@ std::vector Gui::getFocusStrings(df::viewscreen* top) if (dfhack_viewscreen::is_instance(top)) { - auto name = static_cast(top)->getFocusStrings(); + auto name = static_cast(top)->getFocusString(); focusStrings.push_back(name.empty() ? "dfhack" : "dfhack/" + name); } else if (virtual_identity *id = virtual_identity::get(top))