From cd8ea2eead3e76797f9f20873714a2f314183d9a Mon Sep 17 00:00:00 2001
From: hikerstk <hikerstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Wed, 5 Jan 2011 05:27:59 +0000
Subject: [PATCH] Removed compiler warning, updated VS project file.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7263 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/graphics/particle_kind.cpp  |  6 +++---
 src/ide/vc9/supertuxkart.vcproj | 28 ++++++++++------------------
 src/karts/kart.cpp              | 10 +++++++---
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/graphics/particle_kind.cpp b/src/graphics/particle_kind.cpp
index 8c4d751b8..8385da275 100644
--- a/src/graphics/particle_kind.cpp
+++ b/src/graphics/particle_kind.cpp
@@ -31,9 +31,9 @@
 ParticleKind::ParticleKind(const std::string file) : m_min_start_color(255,255,255,255), m_max_start_color(255,255,255,255)
 {
     // ---- Initial values to prevent readin uninitialized values
-    m_max_size      = 0.5;
-    m_min_size      = 0.5;
-    m_spread_factor = 0.001;
+    m_max_size      = 0.5f;
+    m_min_size      = 0.5f;
+    m_spread_factor = 0.001f;
     m_shape         = EMITTER_POINT;
     m_material      = NULL;
     m_min_rate      = 10;
diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj
index 6ebe019ba..c41b5edbe 100644
--- a/src/ide/vc9/supertuxkart.vcproj
+++ b/src/ide/vc9/supertuxkart.vcproj
@@ -695,7 +695,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\graphics\nitro.cpp"
+					RelativePath="..\..\graphics\particle_emitter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\particle_kind.cpp"
 					>
 				</File>
 				<File
@@ -710,10 +714,6 @@
 					RelativePath="..\..\graphics\slip_stream.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\graphics\smoke.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\graphics\stars.cpp"
 					>
@@ -958,10 +958,6 @@
 					RelativePath="..\..\states_screens\addons_screen.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\states_screens\addons_update_screen.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\states_screens\arenas_screen.cpp"
 					>
@@ -1645,7 +1641,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\graphics\nitro.hpp"
+					RelativePath="..\..\graphics\particle_emitter.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\particle_kind.hpp"
 					>
 				</File>
 				<File
@@ -1660,10 +1660,6 @@
 					RelativePath="..\..\graphics\slip_stream.hpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\graphics\smoke.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\graphics\stars.hpp"
 					>
@@ -1880,10 +1876,6 @@
 					RelativePath="..\..\states_screens\addons_screen.hpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\states_screens\addons_update_screen.hpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\states_screens\arenas_screen.hpp"
 					>
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index d4a5d9385..f00c3d5f8 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1444,8 +1444,10 @@ void Kart::loadData()
     {
         try
         {
-            core::vector3df position(-getKartWidth()*0.35f, 0.06, -getKartLength()*0.5f);
-            m_smoke_system = new ParticleEmitter(new ParticleKind(file_manager->getDataFile("smoke.xml")), position);
+            core::vector3df position(-getKartWidth()*0.35f, 0.06f, -getKartLength()*0.5f);
+            m_smoke_system = new ParticleEmitter(
+                                 new ParticleKind(file_manager->getDataFile("smoke.xml")),
+                                 position);
         }
         catch (std::runtime_error& e)
         {
@@ -1459,7 +1461,9 @@ void Kart::loadData()
     
     try
     {
-        m_nitro  = new ParticleEmitter(new ParticleKind(file_manager->getDataFile("nitro.xml")), position, getNode());
+        m_nitro  = new ParticleEmitter(
+                        new ParticleKind(file_manager->getDataFile("nitro.xml")),
+                        position, getNode());
     }
     catch (std::runtime_error& e)
     {