[Orxonox-commit 7156] r11773 - code/branches/Presentation_HS17_merge/src/modules/superorxobros

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-18 18:21:10 +0100 (Sun, 18 Feb 2018)
New Revision: 11773

Modified:
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc
Log:
[SOBv2_HS17] fixed a bunch of compiler warnings (MSVC)

Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc	2018-02-18 16:49:32 UTC (rev 11772)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc	2018-02-18 17:21:10 UTC (rev 11773)
@@ -168,7 +168,7 @@
             this->figure_->dead_ = true;
         //The time on the HUD
         if (!done_)
-            timeLeft_-=dt*2.5;
+            timeLeft_-=dt*2.5f;
     }
 
 

Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h	2018-02-18 16:49:32 UTC (rev 11772)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h	2018-02-18 17:21:10 UTC (rev 11773)
@@ -82,7 +82,7 @@
                 points_+=poi;
             }
             int getTimeLeft() {
-                return timeLeft_;
+                return (int) timeLeft_;
             }
             std::string getInfoText() {
                 return info_;

Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc	2018-02-18 16:49:32 UTC (rev 11772)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc	2018-02-18 17:21:10 UTC (rev 11773)
@@ -179,7 +179,7 @@
             velocity.z -= gravityAcceleration_*dt;
             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);
 
             if(abs(this->getPosition().z) > 1000) this->destroyLater();

Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc	2018-02-18 16:49:32 UTC (rev 11772)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc	2018-02-18 17:21:10 UTC (rev 11773)
@@ -63,7 +63,7 @@
 
         //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;