[Orxonox-commit 5572] r10235 - code/branches/surfaceraceHS14/src/modules/dodgerace

[landauf at orxonox.net]

Author: landauf
Date: 2015-02-01 15:43:14 +0100 (Sun, 01 Feb 2015)
New Revision: 10235

Modified:
   code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc
   code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h
Log:
fixed build and warnings (MSVC)

Modified: code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc	2015-02-01 14:22:58 UTC (rev 10234)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc	2015-02-01 14:43:14 UTC (rev 10235)
@@ -94,10 +94,10 @@
 			currentPosition = getPlayer()->getWorldPosition().x;
 			counter = counter + (currentPosition - lastPosition);
 			lastPosition = currentPosition;
-			point = currentPosition;
-			getPlayer()->speed = 830 - (point / 1000);
+			point = (int) currentPosition;
+			getPlayer()->speed = 830.0f - (point / 1000);
 
-			for(uint i=0; i < cubeList.size();i++)
+			for(unsigned int i=0; i < cubeList.size();i++)
 			{
 				if(cubeList.at(i)->getPosition().x < currentPosition-3000)
 				{
@@ -122,7 +122,7 @@
 
 					}
 
-					cube->setPosition(getPlayer()->getWorldPosition() + Vector3(5000, 0, -3600 + (i*1200)));
+					cube->setPosition(getPlayer()->getWorldPosition() + Vector3(5000.0f, 0.0f, -3600.0f + (i*1200)));
 					//stEntity->setScale3D(50,50,50);
 				}
 
@@ -168,7 +168,7 @@
     {
     	orxout() << "start" << endl;
         init();
-		for(uint i=0; i< cubeList.size();i++)
+		for(unsigned int i=0; i< cubeList.size();i++)
 		{
 			cubeList.at(i)->destroy();
 			cubeList.erase(cubeList.begin()+i);

Modified: code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h	2015-02-01 14:22:58 UTC (rev 10234)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h	2015-02-01 14:43:14 UTC (rev 10235)
@@ -97,10 +97,10 @@
             bool bShowLevel;
             int lives;
             int multiplier;
-            int counter;
+            float counter;
             int pattern;
-            int currentPosition;
-            int lastPosition;
+            float currentPosition;
+            float lastPosition;
 
        private:
             Timer endGameTimer;