[Orxonox-commit 3294] r7984 - code/branches/kicklib/src/orxonox/gametypes

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-27 07:44:55 +0100 (Sun, 27 Feb 2011)
New Revision: 7984

Modified:
   code/branches/kicklib/src/orxonox/gametypes/LastManStanding.cc
Log:
Fixed two msvc warnings.

Modified: code/branches/kicklib/src/orxonox/gametypes/LastManStanding.cc
===================================================================
--- code/branches/kicklib/src/orxonox/gametypes/LastManStanding.cc	2011-02-27 06:43:24 UTC (rev 7983)
+++ code/branches/kicklib/src/orxonox/gametypes/LastManStanding.cc	2011-02-27 06:44:55 UTC (rev 7984)
@@ -221,7 +221,7 @@
             }
             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
             }
@@ -250,7 +250,7 @@
 
                     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());
                 }