Changeset 2935

Timestamp:

Apr 27, 2009, 5:12:59 PM (16 years ago)

Author:

mockm

Message:

new revision of gametype UnderAttack

Location:

code/branches/gametypes/src/orxonox/objects

Files:

• gametypes/UnderAttack.cc (modified) (1 diff)
• worldentities/pawns/Destroyer.cc (modified) (2 diffs)

code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc

@@ -121 +121 @@
     void UnderAttack::tick(float dt)
     {
-        gameTime_ = gameTime_ - dt;
-        if (gameTime_<= 0)
+        SUPER(UnderAttack, tick, dt);
+
+        if (this->hasStarted())
         {
-            gameEnded_ = true;
-            COUT(0) << "Time is up! Team 1 has won!" << std::endl;
+            gameTime_ = gameTime_ - dt;
+            if (gameTime_<= 0 && !gameEnded_)
+            {
+                gameEnded_ = true;
+                COUT(0) << "Time is up! Team 1 has won!" << std::endl;
+            }
         }
     }

code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc

@@ -39 +39 @@
 #include "core/XMLPort.h"
 #include "objects/items/Engine.h"
+#include "objects/gametypes/UnderAttack.h"
 
 namespace orxonox
@@ -48 +49 @@
         RegisterObject(Destroyer);
 
+        UnderAttack* gametype = dynamic_cast<UnderAttack*>(this->getGametype());
+        if (gametype)
+        {
+            gametype->addDestroyer(this);
+        }
     }