Changeset 8740 for code

Timestamp:

Jul 10, 2011, 5:46:32 PM (13 years ago)

Author:

landauf

Message:

fixed some warnings, added vs to ignore list

Location:

code/branches/output

Files:

• . (modified) (1 prop)
• src/modules/gametypes/SpaceRace.cc (modified) (3 diffs)
• src/orxonox/infos/GametypeInfo.cc (modified) (1 diff)

code/branches/output

@@ -1 +1 @@
 build
 codeblocks
+vs
 dependencies

@@ -1 +1 @@
 build
 codeblocks
+vs
 dependencies

code/branches/output/src/modules/gametypes/SpaceRace.cc

@@ -55 +55 @@
             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)
@@ -67 +67 @@
             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.";
@@ -95 +95 @@
         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)

code/branches/output/src/orxonox/infos/GametypeInfo.cc

@@ -196 +196 @@
         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();
     }

@@ -1 +1 @@
 build
 codeblocks
+vs
 dependencies