Changeset 10235 for code/branches

Timestamp:

Feb 1, 2015, 3:43:14 PM (10 years ago)

Author:

landauf

Message:

fixed build and warnings (MSVC)

Location:

code/branches/surfaceraceHS14/src/modules/dodgerace

Files:

• DodgeRace.cc (modified) (3 diffs)
• DodgeRace.h (modified) (1 diff)

code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc

@@ -95 +95 @@
                         counter = counter + (currentPosition - lastPosition);
                         lastPosition = currentPosition;
-                        point = currentPosition;
-                        getPlayer()->speed = 830 - (point / 1000);
-
-                        for(uint i=0; i < cubeList.size();i++)
+                        point = (int) currentPosition;
+                        getPlayer()->speed = 830.0f - (point / 1000);
+
+                        for(unsigned int i=0; i < cubeList.size();i++)
                         {
                                 if(cubeList.at(i)->getPosition().x < currentPosition-3000)
@@ -123 +123 @@
                                         }
 
-                                        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);
                                 }
@@ -169 +169 @@
         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();

code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h

@@ -98 +98 @@
             int lives;
             int multiplier;
-            int counter;
+            float counter;
             int pattern;
-            int currentPosition;
-            int lastPosition;
+            float currentPosition;
+            float lastPosition;
 
        private: