diff --git a/Source/control.h b/Source/control.h index 591e40c54..13e71afda 100644 --- a/Source/control.h +++ b/Source/control.h @@ -77,10 +77,6 @@ inline bool CanPanelsCoverView() const Rectangle &mainPanel = GetMainPanel(); return GetScreenWidth() <= mainPanel.size.width && GetScreenHeight() <= SidePanelSize.height + mainPanel.size.height; } -void DrawSpellList(const Surface &out); -void SetSpell(); -void SetSpeedSpell(size_t slot); -void ToggleSpell(size_t slot); void AddPanelString(std::string_view str); void AddPanelString(std::string &&str); @@ -127,12 +123,6 @@ void DrawFlaskValues(const Surface &out, Point pos, int currValue, int maxValue) */ void control_update_life_mana(); -/** - * @brief draws the current right mouse button spell. - * @param out screen buffer representing the main UI panel - */ -void DrawSpell(const Surface &out); - void InitControlPan(); void DrawCtrlPan(const Surface &out); diff --git a/Source/controls/game_controls.cpp b/Source/controls/game_controls.cpp index 1c19b5fe0..9538e1032 100644 --- a/Source/controls/game_controls.cpp +++ b/Source/controls/game_controls.cpp @@ -13,6 +13,7 @@ #include "gamemenu.h" #include "gmenu.h" #include "options.h" +#include "panels/spell_list.hpp" #include "qol/stash.h" #include "stores.h" diff --git a/Source/controls/touch/event_handlers.cpp b/Source/controls/touch/event_handlers.cpp index 748e6056b..9b688c709 100644 --- a/Source/controls/touch/event_handlers.cpp +++ b/Source/controls/touch/event_handlers.cpp @@ -9,6 +9,7 @@ #include "gmenu.h" #include "inv.h" #include "panels/spell_book.hpp" +#include "panels/spell_list.hpp" #include "qol/stash.h" #include "stores.h" #include "utils/ui_fwd.h" diff --git a/Source/engine/render/scrollrt.cpp b/Source/engine/render/scrollrt.cpp index b474a9230..3cae45325 100644 --- a/Source/engine/render/scrollrt.cpp +++ b/Source/engine/render/scrollrt.cpp @@ -35,6 +35,7 @@ #include "options.h" #include "panels/charpanel.hpp" #include "panels/console.hpp" +#include "panels/spell_list.hpp" #include "plrmsg.h" #include "qol/chatlog.h" #include "qol/floatingnumbers.h" diff --git a/Source/panels/spell_list.hpp b/Source/panels/spell_list.hpp index 65ac60ddb..8dba57c02 100644 --- a/Source/panels/spell_list.hpp +++ b/Source/panels/spell_list.hpp @@ -16,6 +16,10 @@ struct SpellListItem { bool isSelected; }; +/** + * @brief draws the current right mouse button spell. + * @param out screen buffer representing the main UI panel + */ void DrawSpell(const Surface &out); void DrawSpellList(const Surface &out); std::vector GetSpellListItems();