Changeset 11773 for code/branches/Presentation_HS17_merge/src

Timestamp:

Feb 18, 2018, 6:21:10 PM (7 years ago)

Author:

landauf

Message:

[SOBv2_HS17] fixed a bunch of compiler warnings (MSVC)

Location:

code/branches/Presentation_HS17_merge/src/modules/superorxobros

Files:

• SOB.cc (modified) (1 diff)
• SOB.h (modified) (1 diff)
• SOBFireball.cc (modified) (1 diff)
• SOBQBlock.cc (modified) (1 diff)

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc

@@ -169 +169 @@
         //The time on the HUD
         if (!done_)
-            timeLeft_-=dt*2.5;
+            timeLeft_-=dt*2.5f;
     }
 

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h

@@ -83 +83 @@
             }
             int getTimeLeft() {
-                return timeLeft_;
+                return (int) timeLeft_;
             }
             std::string getInfoText() {

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc

@@ -180 +180 @@
             velocity.x = dir*speed_;
             velocity.y = 0;
-            if(hitCounter_ >= 3) velocity.y = 0.1*speed_;
+            if(hitCounter_ >= 3) velocity.y = 0.1f*speed_;
             setVelocity(velocity);
 

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc

@@ -64 +64 @@
         //If you hit the QBlock, the visibility of all attached objects get inverted! Pretty easy way to create changing blocks :)
         float v_z = otherObject->getVelocity().z;
-        int collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
+        float collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
         if (!used_ && v_z > 50.0 && collDisZ_ > 0) {
             used_ = true;