From 19ccc27d37ca3d0f7b71ed64a52c14b8d06630ae Mon Sep 17 00:00:00 2001 From: SmallJoker 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 @@ 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 deleted file mode 100644 index e3cb7dbd15e0fe2299acaed4252c7b1245b2537e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 zcmds3dsNcd7CzvM9#YwarD6|Jhn1#QO1?F<{H36YWtJvRIi-%Ih=EE6!&XKB1pF&L zSgZZ@XQgAu3Z^2v*+)l+V?PR3dL!Vd&_(;UVF5c#aM`A2XMt5Exf`MoSvLlk3C}ED z`BL?s_Il_?lcT`@+_v^E=J zD>D%=lpTt2*J>tC`s^(6Xd%3El!X!FYliBWrpL8S4^Wa=&c|Fqm3SrN6e|w8??(y3 zc?5JT+sU2e*rvs$URY;Jgec&WbCT9>llg@^pX+Gpo00oUO?91qpooQhOwS?HElwGc zsI;zGRT$2JHh*_<2?buV=@`_CXjzykp{YRbD}IJA<$zdaplI8>RR2{+_P%p3KAFxM zUP@uA_?v}jsG-coDLOaDr=<2K&#tkmr`0`Eb4|(Nxar6d=40*{ZRC*p^;+aW&hgbV z@vM#@)HlnwjRQX?&iCA(wlO`RSW~5y|EU`zCd@#Z{L%}hWiA!zjMIALa;|QwOM4kB zELW0A_D~2s11yyc(T>AyS@h{k%Vgm(c5zV+X_nFo`x@~Baj`yoX*-0(4CPC*yxcB( zmB1^b*3k?K4d&GM)LD7X%1PrV=S^M?pTBX}>i3C&(B3}%2hyHG@{3<%tyk?HulPygOR5o$L&C7lr3*7PK&AJ+M@ z8QZunqKGn>AMJTeeC8q4c2=WVE-%g-%$N7+?@s6!@OV;p(rGC`y`ziFeo7@yCH!%l zs%0-|o3KEC9|5f1#E8h%IL@2!fyV8pO1Y{mqQeE(udXsUK>xv>QNrVeLR7HzbAh?? zs3Ct06e@=EbjoExlTOC5xWH6)_Ur}$@>Y^D`%SUL%uK2qgS;ay`|d@;tKJu|xt5=? zw9@bb$#=Jl^FJ2BSBtppu$&rSdQFfg0TsMxzg#kIfj*{DC5?6CLotskKQze?^3=Yx zenD4nFYH=NL{Qq+*EeUL$H=Tx~P}8N=NRG7r^92)q|1&f}Ur4r{m zD&!aMPt&kzFc0U$#CfAVIVoH_o_!hZz3XUB5xkcp$6n1e>>i)0g|d)L(