Changeset 3099 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

May 28, 2009, 1:58:22 AM (16 years ago)

Author:

landauf

Message:

Added Gameplay messages (Announces, Killmessages and Deathmessages)

File:

• code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

@@ -72 +72 @@
     {
         SUPER(CheckPoint, changedActivity);
-        
+
         if (this->BaseObject::isActive())
         {
@@ -93 +93 @@
             this->setRadarVisibility(false);
 
-            if (bIsTriggered && bIsFirst_)
+            if (bIsTriggered)
             {
-                gametype->setTimeLimit(addTime_);
-                gametype->firstCheckpointReached(true);
-            }
+                if (bIsFirst_)
+                {
+                    gametype->setTimeLimit(addTime_);
+                    gametype->firstCheckpointReached(true);
+                }
 
-            if (bIsTriggered && bIsDestination_)
-            {
-                gametype->end();
+                if (bIsDestination_)
+                {
+                    const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage("Congratulations - you have won the match!");
+                    gametype->end();
+                }
+
+                if (!bIsFirst_ && !bIsDestination_)
+                {
+                    const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage("Checkpoint reached");
+                }
             }
         }