Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Font] Useless private member removed.

Browse Source
This commit is contained in:
Quentin Bazin 2020-03-08 23:14:52 +01:00
parent 1b2f30ba56
commit 1a9a0db36d
3 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/source/gui/Font.cpp
View File

@ -34,8 +34,6 @@
Font::Font(const std::string &textureName, const std::string &configPath) Font::Font(const std::string &textureName, const std::string &configPath)
: m_texture(gk::ResourceHandler::getInstance().get<gk::Texture>(textureName)) : m_texture(gk::ResourceHandler::getInstance().get<gk::Texture>(textureName))
{ {
m_textureName = textureName;
std::memset(m_charWidth, 0, sizeof(u8) * 256); std::memset(m_charWidth, 0, sizeof(u8) * 256);
parseConfig(configPath); parseConfig(configPath);

2
client/source/gui/Font.hpp
View File

@ -44,13 +44,11 @@ class Font {
u8 getCharWidth(u8 c) const { return m_charWidth[c]; } u8 getCharWidth(u8 c) const { return m_charWidth[c]; }
gk::Vector2i getTileSize() const { return {m_width, m_height}; } gk::Vector2i getTileSize() const { return {m_width, m_height}; }
const std::string &textureName() const { return m_textureName; } // FIXME: Will be removed later
const gk::Texture &texture() const { return m_texture; } const gk::Texture &texture() const { return m_texture; }
private: private:
void parseConfig(const std::string &configPath); void parseConfig(const std::string &configPath);
std::string m_textureName; // FIXME: Will be removed later
gk::Texture &m_texture; gk::Texture &m_texture;
u8 m_charWidth[256]; u8 m_charWidth[256];

1
client/source/gui/TextButton.hpp
View File

@ -66,7 +66,6 @@ class TextButton : public Widget {
CppCallback m_cppCallback; CppCallback m_cppCallback;
LuaCallback m_luaCallback; LuaCallback m_luaCallback;
// FIXME: Replace these by an enum State
bool m_isHovered = false; bool m_isHovered = false;
bool m_isEnabled = true; bool m_isEnabled = true;
}; };