Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / source / Irrlicht / CGUIFont.cpp

diff --git a/source/Irrlicht/CGUIFont.cpp b/source/Irrlicht/CGUIFont.cpp
index 0857924448111c0c8bf6751aa0f9bb626feff29c..0fa829815bc667b88cbb3614e0b3631b1bb5c113 100644 (file)
--- a/source/Irrlicht/CGUIFont.cpp
+++ b/source/Irrlicht/CGUIFont.cpp
@@ -203,17 +203,15 @@ void CGUIFont::setMaxHeight()
                return;\r
 \r
        MaxHeight = 0;\r
-       s32 t;\r
 \r
        core::array< core::rect<s32> >& p = SpriteBank->getPositions();\r
 \r
        for (u32 i=0; i<p.size(); ++i)\r
        {\r
-               t = p[i].getHeight();\r
+               const s32 t = p[i].getHeight();\r
                if (t>MaxHeight)\r
                        MaxHeight = t;\r
        }\r
-\r
 }\r
 \r
 void CGUIFont::pushTextureCreationFlags(bool(&flags)[3])\r