Changeset 7984 for code/branches

Timestamp:

Feb 27, 2011, 7:44:55 AM (14 years ago)

Author:

rgrieder

Message:

Fixed two msvc warnings.

File:

• code/branches/kicklib/src/orxonox/gametypes/LastManStanding.cc (modified) (2 diffs)

code/branches/kicklib/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());