[Supertuxkart-commit] SF.net SVN: supertuxkart:[13542] main/trunk/src

[<hik...@us...>]

Revision: 13542
          http://sourceforge.net/p/supertuxkart/code/13542
Author:   hikerstk
Date:     2013-08-22 03:50:50 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Fixed compiler warnings.

Modified Paths:
--------------
    main/trunk/src/graphics/material.cpp
    main/trunk/src/states_screens/race_gui.cpp

Modified: main/trunk/src/graphics/material.cpp
===================================================================
--- main/trunk/src/graphics/material.cpp	2013-08-22 02:25:08 UTC (rev 13541)
+++ main/trunk/src/graphics/material.cpp	2013-08-22 03:50:50 UTC (rev 13542)
@@ -1022,7 +1022,6 @@
     }
     if (m_smooth_reflection_shader)
     {
-        IVideoDriver* video_driver = irr_driver->getVideoDriver();
         if (UserConfigParams::m_pixel_shaders &&
             irr_driver->isGLSL())
         {
@@ -1308,7 +1307,6 @@
 
     if (m_graphical_effect == GE_WATER_SHADER)
     {
-        IVideoDriver* video_driver = irr_driver->getVideoDriver();
         if (UserConfigParams::m_pixel_shaders &&
             irr_driver->isGLSL())
         {
@@ -1345,7 +1343,6 @@
 
     if (m_graphical_effect == GE_GRASS)
     {
-        IVideoDriver* video_driver = irr_driver->getVideoDriver();
         if (UserConfigParams::m_pixel_shaders &&
             irr_driver->isGLSL())
         {

Modified: main/trunk/src/states_screens/race_gui.cpp
===================================================================
--- main/trunk/src/states_screens/race_gui.cpp	2013-08-22 02:25:08 UTC (rev 13541)
+++ main/trunk/src/states_screens/race_gui.cpp	2013-08-22 03:50:50 UTC (rev 13542)
@@ -169,6 +169,8 @@
     {
         drawGlobalReadySetGo();
     }
+	if(world->getPhase() == World::GOAL_PHASE)
+			drawGlobalGoal();
 
     // Timer etc. are not displayed unless the game is actually started.
     if(!world->isRacePhase()) return;
@@ -264,14 +266,12 @@
 		irr_driver->getVideoDriver()->draw2DImage(m_marker, position, source,
 			NULL, NULL, true);
 		core::stringw score = StringUtils::toWString(soccerWorld->getScore(i));
-		int stringWidth =
-			GUIEngine::getFont()->getDimension(score.c_str()).Width;
-		int stringHeight =
+		int string_height =
 			GUIEngine::getFont()->getDimension(score.c_str()).Height;
 		core::recti pos(position.UpperLeftCorner.X + 5,
 						position.LowerRightCorner.Y + offsetY,
 						position.LowerRightCorner.X,
-						position.LowerRightCorner.Y + stringHeight);
+						position.LowerRightCorner.Y + string_height);
 
 		font->draw(score.c_str(),pos,color);
 		offsetX += position.LowerRightCorner.X;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.