Browse Source

Remove duplicate function definitions from control.h

pull/6863/head
obligaron 2 years ago committed by Anders Jenbo
parent
commit
dc4cd43e8f
  1. 10
      Source/control.h
  2. 1
      Source/controls/game_controls.cpp
  3. 1
      Source/controls/touch/event_handlers.cpp
  4. 1
      Source/engine/render/scrollrt.cpp
  5. 4
      Source/panels/spell_list.hpp

10
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);

1
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"

1
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"

1
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"

4
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<SpellListItem> GetSpellListItems();

Loading…
Cancel
Save