Changeset 11595 for code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

Timestamp:

Nov 27, 2017, 2:03:45 PM (8 years ago)

Author:

pascscha

Message:

cleanup

File:

• code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) (4 diffs)

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

@@ -40 +40 @@
 #include "weapons/projectiles/Projectile.h"
 #include <math.h> 
+#include <ctime>
 
 namespace orxonox
@@ -53 +54 @@
         this->gravity = 1;
         isDead = true;
+        deathTime = 0;
         
     }
@@ -128 +130 @@
     void FlappyOrxShip::moveRightLeft(const Vector2& value){}
 
+    int FlappyOrxShip::timeUntilRespawn(){
+        return 2-time(0)+deathTime;
+    }
+
     void FlappyOrxShip::boost(bool boost){
-        if(isDead){
+
+    
+        if(isDead&&timeUntilRespawn()<=0){
             isDead = false;
             getGame()->setDead(false);
@@ -156 +164 @@
     {
         isDead = true;
+
+        deathTime = time(0);
+
+        orxout()<<"death time: "<<deathTime<<std::endl;
         Vector3 pos = getPosition();
         pos.x = 0;