From 2e48901c69f8f237c47ee4b335973d80a5db1b65 Mon Sep 17 00:00:00 2001
From: hikerstk <hikerstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 20 Sep 2010 14:44:18 +0000
Subject: [PATCH] Updated VS project file, fixed compiler warnings.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6076 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/widgets/dynamic_ribbon_widget.cpp | 4 ++--
 src/ide/vc9/supertuxkart.vcproj                 | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
index 479da54a7..524b04225 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -73,8 +73,8 @@ int estimateIconAreaFor(const int rowCount, const int wantedIconWidth,
 {
     const int row_height = height / rowCount;
 
-    float icon_height = row_height;
-    float icon_width = int(row_height * iconAspectRatio);
+    float icon_height = (float)row_height;
+    float icon_width = row_height * iconAspectRatio;
     
     const int icons_per_row = std::min(int(width / icon_width), int(width / wantedIconWidth));
     
diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj
index df407c164..60344e97b 100644
--- a/src/ide/vc9/supertuxkart.vcproj
+++ b/src/ide/vc9/supertuxkart.vcproj
@@ -982,6 +982,10 @@
 					RelativePath="..\..\states_screens\help_screen_3.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_4.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\states_screens\kart_selection.cpp"
 					>
@@ -1852,6 +1856,10 @@
 					RelativePath="..\..\states_screens\help_screen_3.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_4.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\states_screens\kart_selection.hpp"
 					>