Changeset 3056 for code/trunk

Timestamp:

May 25, 2009, 1:56:53 PM (16 years ago)

Author:

Aurelian

Message:

Bug in gametype Asteroids fixed: game ends directly after death

Location:

code/trunk/src/orxonox/objects/gametypes

Files:

• Asteroids.cc (modified) (2 diffs)
• Asteroids.h (modified) (1 diff)

code/trunk/src/orxonox/objects/gametypes/Asteroids.cc

@@ -44 +44 @@
         RegisterObject(Asteroids);
         this->firstCheckpointReached_ = false;
-        this->firstTimeSpawned_ = false;
     }
 
@@ -62 +61 @@
     }
 
-    void Asteroids::spawnPlayer(PlayerInfo* player)
+    void Asteroids::pawnKilled(Pawn* victim, Pawn* killer)
     {
-        if (this->timerIsActive_ && this->firstTimeSpawned_)
+        if (victim && victim->getPlayer())
         {
             this->end();
-            return;
         }
-
-        this->firstTimeSpawned_ = true;
-        Gametype::spawnPlayer(player);
     }
 

code/trunk/src/orxonox/objects/gametypes/Asteroids.h

@@ -51 +51 @@
 
         protected:
-            virtual void spawnPlayer(PlayerInfo* player);
+            virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
 
         private:
             bool firstCheckpointReached_;
             bool gameEnded_;
-            bool firstTimeSpawned_;
-
     };
 }