From 19ccc27d37ca3d0f7b71ed64a52c14b8d06630ae Mon Sep 17 00:00:00 2001 From: SmallJoker <mk939@ymail.com> Date: Thu, 11 Dec 2014 20:12:28 +0100 Subject: [PATCH] Fix MSVC compiling warnings and remove an unused texture --- src/fontengine.cpp | 3 +-- src/fontengine.h | 1 - textures/base/pack/ladder_down.png | Bin 2299 -> 0 bytes 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 textures/base/pack/ladder_down.png diff --git a/src/fontengine.cpp b/src/fontengine.cpp index e6564854d..b9d35ba42 100644 --- a/src/fontengine.cpp +++ b/src/fontengine.cpp @@ -45,14 +45,13 @@ FontEngine::FontEngine(Settings* main_settings, gui::IGUIEnvironment* env) : m_settings(main_settings), m_env(env), m_font_cache(), - m_default_size(), m_currentMode(FM_Standard), m_lastMode(), m_lastSize(0), m_lastFont(NULL) { - for ( unsigned int i = 0; i < FM_MaxMode; i++) { + for (unsigned int i = 0; i < FM_MaxMode; i++) { m_default_size[i] = (FontMode) FONT_SIZE_UNSPECIFIED; } diff --git a/src/fontengine.h b/src/fontengine.h index 679a96bea..9edde05f8 100644 --- a/src/fontengine.h +++ b/src/fontengine.h @@ -86,7 +86,6 @@ class FontEngine m_settings(NULL), m_env(NULL), m_font_cache(), - m_default_size(), m_currentMode(FM_Standard), m_lastMode(), m_lastSize(0), diff --git a/textures/base/pack/ladder_down.png b/textures/base/pack/ladder_down.png deleted file mode 100644 index e3cb7dbd15e0fe2299acaed4252c7b1245b2537e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 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 Z&V!N<cVNE+g=qdH0P-Pt-``8h_!H4OuMGeI -- GitLab