Changeset 10218 for code/trunk/src/modules/jump/JumpFigure.cc

Timestamp:

Jan 31, 2015, 11:29:45 PM (9 years ago)

Author:

landauf

Message:

fixed build and warnings with MSVC

File:

• code/trunk/src/modules/jump/JumpFigure.cc (modified) (3 diffs)

code/trunk/src/modules/jump/JumpFigure.cc

@@ -184 +184 @@
         // Move through the left and right screen boundaries
         Vector3 position = getPosition();
-        if (position.x < -fieldWidth_*1.1)
-        {
-            position.x = fieldWidth_*1.1;
-        }
-        else if (position.x > fieldWidth_*1.1)
-        {
-            position.x = -fieldWidth_*1.1;
+        if (position.x < -fieldWidth_*1.1f)
+        {
+            position.x = fieldWidth_*1.1f;
+        }
+        else if (position.x > fieldWidth_*1.1f)
+        {
+            position.x = -fieldWidth_*1.1f;
         }
         setPosition(position);
@@ -207 +207 @@
         {
             Vector3 velocity = getVelocity();
-            velocity.z = (bootsActive_ ? 1.2*jumpSpeed_ : jumpSpeed_);
+            velocity.z = (bootsActive_ ? 1.2f*jumpSpeed_ : jumpSpeed_);
             setVelocity(velocity);
 
@@ -221 +221 @@
         {
             Vector3 velocity = getVelocity();
-            velocity.z = 1.2*jumpSpeed_;
+            velocity.z = 1.2f*jumpSpeed_;
             setVelocity(velocity);
         }