[Orxonox-commit 4069] r8740 - in code/branches/output: . src/modules/gametypes src/orxonox/infos

[landauf at orxonox.net]

Author: landauf
Date: 2011-07-10 17:46:32 +0200 (Sun, 10 Jul 2011)
New Revision: 8740

Modified:
   code/branches/output/
   code/branches/output/src/modules/gametypes/SpaceRace.cc
   code/branches/output/src/orxonox/infos/GametypeInfo.cc
Log:
fixed some warnings, added vs to ignore list


Property changes on: code/branches/output
___________________________________________________________________
Modified: svn:ignore
   - build
codeblocks
dependencies

   + build
codeblocks
vs
dependencies


Modified: code/branches/output/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/output/src/modules/gametypes/SpaceRace.cc	2011-07-10 08:41:13 UTC (rev 8739)
+++ code/branches/output/src/modules/gametypes/SpaceRace.cc	2011-07-10 15:46:32 UTC (rev 8740)
@@ -54,7 +54,7 @@
         {
             this->clock_.capture();
             int s = this->clock_.getSeconds();
-            int ms = this->clock_.getMilliseconds()-1000*s;
+            int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
             const std::string& message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
                         + "You didn't reach the check point " + multi_cast<std::string>(this->bCheckpointsReached_+1)
                         + " before the time limit. You lose!";
@@ -66,7 +66,7 @@
         {
             this->clock_.capture();
             int s = this->clock_.getSeconds();
-            int ms = this->clock_.getMilliseconds()-1000*s;
+            int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
             const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
                         + "." + multi_cast<std::string>(ms) + " seconds.";
             COUT(3) << message << std::endl;
@@ -94,7 +94,7 @@
         this->bCheckpointsReached_++;
         this->clock_.capture();
         int s = this->clock_.getSeconds();
-        int ms = this->clock_.getMilliseconds()-1000*s;
+        int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
         const std::string& message = "Checkpoint " + multi_cast<std::string>(this->getCheckpointsReached())
                         + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
                         + " seconds.\n";

Modified: code/branches/output/src/orxonox/infos/GametypeInfo.cc
===================================================================
--- code/branches/output/src/orxonox/infos/GametypeInfo.cc	2011-07-10 08:41:13 UTC (rev 8739)
+++ code/branches/output/src/orxonox/infos/GametypeInfo.cc	2011-07-10 15:46:32 UTC (rev 8740)
@@ -195,7 +195,7 @@
         
         this->startCountdown_ = countdown;
         // Set the counter to the ceiling of the current countdown.
-        this->counter_ = std::ceil(countdown);
+        this->counter_ = static_cast<unsigned int>(std::ceil(countdown));
         this->changedCountdownCounter();
     }