Changeset 8234 for code/trunk/src/orxonox

Timestamp:

Apr 12, 2011, 5:10:26 PM (14 years ago)

Author:

rgrieder

Message:

Removed 6 MSVC warnings about conversions.

Location:

code/trunk/src/orxonox/gametypes

Files:

• LastManStanding.cc (modified) (2 diffs)
• LastTeamStanding.cc (modified) (2 diffs)

code/trunk/src/orxonox/gametypes/LastManStanding.cc

@@ -222 +222 @@
             else
             {
-                float damage=pawn->getMaxHealth()*punishDamageRate*0.5;//TODO: Factor 0.5 is hard coded. Where is the ratio between MaxHealth actually defined?
+                float damage=pawn->getMaxHealth()*punishDamageRate*0.5f;//TODO: Factor 0.5 is hard coded. Where is the ratio between MaxHealth actually defined?
                 pawn->removeHealth(damage);
                 this->timeToAct_[player]=timeRemaining;//reset timer
@@ -251 +251 @@
                     if (it->first->getClientID()== CLIENTID_UNKNOWN)
                         continue;
-                    int output=1+playerDelayTime_[it->first];
+                    int output=1+(int)playerDelayTime_[it->first];
                     const std::string& message = "Respawn in " +multi_cast<std::string>(output)+ " seconds." ;//Countdown
                     this->gtinfo_->sendFadingMessage(message,it->first->getClientID());

code/trunk/src/orxonox/gametypes/LastTeamStanding.cc

@@ -198 +198 @@
                     if (it->first->getClientID()== CLIENTID_UNKNOWN)
                         continue;
-                    int output = 1 + playerDelayTime_[it->first];
+                    int output = 1 + (int)playerDelayTime_[it->first];
                     const std::string& message = "Respawn in " +multi_cast<std::string>(output)+ " seconds." ;//Countdown
                     this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
@@ -294 +294 @@
             else
             {
-                float damage = pawn->getMaxHealth()*punishDamageRate*0.5;//TODO: Factor 0.5 is hard coded. Where is the ratio between MaxHealth actually defined?
+                float damage = pawn->getMaxHealth()*punishDamageRate*0.5f;//TODO: Factor 0.5 is hard coded. Where is the ratio between MaxHealth actually defined?
                 pawn->removeHealth(damage);
                 this->timeToAct_[player] = timeRemaining;//reset timer