Changeset 11232 for code/branches

Timestamp:

Oct 17, 2016, 2:47:02 PM (8 years ago)

Author:

meilel

Message:

neues level file mit namen newnewnewspacerace.oxw

Location:

code/branches/SpaceRace_HS16

Files:

• data/levels/newnewnewspacerace.oxw (added)
• src/modules/gametypes/SpaceRace.cc (modified) (5 diffs)

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

@@ -67 +67 @@
         else
         {
-            message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
+            message = "You win!! Final check point reached after "+ multi_cast<std::string>(s)
                         + "." + multi_cast<std::string>(ms) + " seconds.";
         }
@@ -82 +82 @@
         SUPER(SpaceRace,tick,dt);
 
-        // spawn the players already when the countdown starts, but deactivate their engines
+        // spawns the players when the countdown starts, but deactivates their engines
         if (this->isStartCountdownRunning() && !this->cantMove_)
         {
@@ -92 +92 @@
         }
 
-        // activate the engines again if the countdown ends
+        // activate the engines when the countdown ends
         if (!this->isStartCountdownRunning() && this->cantMove_)
         {
@@ -100 +100 @@
             this->cantMove_= false;
 
-            std::string message = "The match has started! Reach the check points as quickly as possible!";
+            std::string message = "The race begins! Reach the check points as quickly as possible!";
             this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
@@ -122 +122 @@
     bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
     {
-        return false;
+        return true;
     }
 
     bool SpaceRace::allowPawnDamage(Pawn* victim, Pawn* originator)
     {
-        return false;
+        return true;
     }
 
     bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)
     {
-        return false;
+        return true;
     }
 }