diff options
| author | SmallJoker <mk939@ymail.com> | 2014-12-11 20:12:28 +0100 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-12-12 16:09:34 -0500 |
| commit | 19ccc27d37ca3d0f7b71ed64a52c14b8d06630ae (patch) | |
| tree | b4092d6a6caac9bd396868d9fe3255e66096bc51 | |
| parent | 093b1b47d9c874b5d7d17e720f1f68f00d7c000e (diff) | |
| download | minetest-19ccc27d37ca3d0f7b71ed64a52c14b8d06630ae.tar.gz minetest-19ccc27d37ca3d0f7b71ed64a52c14b8d06630ae.tar.bz2 minetest-19ccc27d37ca3d0f7b71ed64a52c14b8d06630ae.zip | |
Fix MSVC compiling warnings and remove an unused texture
| -rw-r--r-- | src/fontengine.cpp | 3 | ||||
| -rw-r--r-- | src/fontengine.h | 1 | ||||
| -rw-r--r-- | textures/base/pack/ladder_down.png | bin | 2299 -> 0 bytes |
3 files changed, 1 insertions, 3 deletions
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 @@ private: 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 Binary files differdeleted file mode 100644 index e3cb7dbd1..000000000 --- a/textures/base/pack/ladder_down.png +++ /dev/null |
