From 1a9a0db36d0437c3dd248bb8c688e8862a8c2038 Mon Sep 17 00:00:00 2001 From: Quentin Bazin Date: Sun, 8 Mar 2020 23:14:52 +0100 Subject: [PATCH] [Font] Useless private member removed. --- client/source/gui/Font.cpp | 2 -- client/source/gui/Font.hpp | 2 -- client/source/gui/TextButton.hpp | 1 - 3 files changed, 5 deletions(-) diff --git a/client/source/gui/Font.cpp b/client/source/gui/Font.cpp index ba5343fa..4b29545f 100644 --- a/client/source/gui/Font.cpp +++ b/client/source/gui/Font.cpp @@ -34,8 +34,6 @@ Font::Font(const std::string &textureName, const std::string &configPath) : m_texture(gk::ResourceHandler::getInstance().get(textureName)) { - m_textureName = textureName; - std::memset(m_charWidth, 0, sizeof(u8) * 256); parseConfig(configPath); diff --git a/client/source/gui/Font.hpp b/client/source/gui/Font.hpp index b3cb8f56..7752e559 100644 --- a/client/source/gui/Font.hpp +++ b/client/source/gui/Font.hpp @@ -44,13 +44,11 @@ class Font { u8 getCharWidth(u8 c) const { return m_charWidth[c]; } 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; } private: void parseConfig(const std::string &configPath); - std::string m_textureName; // FIXME: Will be removed later gk::Texture &m_texture; u8 m_charWidth[256]; diff --git a/client/source/gui/TextButton.hpp b/client/source/gui/TextButton.hpp index ebec29b1..cfbed1bc 100644 --- a/client/source/gui/TextButton.hpp +++ b/client/source/gui/TextButton.hpp @@ -66,7 +66,6 @@ class TextButton : public Widget { CppCallback m_cppCallback; LuaCallback m_luaCallback; - // FIXME: Replace these by an enum State bool m_isHovered = false; bool m_isEnabled = true; };