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

Timestamp:

Nov 20, 2017, 2:00:56 PM (8 years ago)

Author:

pascscha

Message:

skybox

File:

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

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

@@ -69 +69 @@
         SUPER(FlappyOrxShip, tick, dt);
         //Execute movement
-        if (this->hasLocalController()&&not isDead)
+        if (this->hasLocalController())
         {
             if(getHealth()<0){
@@ -81 +81 @@
             
 
-            velocity.y += gravity*dt;
-            if(isFlapping){
-                isFlapping = false;
-                if(pos.z > -150)
-                    velocity.y = -UpwardThrust;
+            if(not isDead){
+                velocity.y += gravity*dt;
+                if(isFlapping){
+                    isFlapping = false;
+                    if(pos.z > -150)
+                        velocity.y = -UpwardThrust;
+                }
+
+                pos += Vector3(speed + velocity.x, 0, velocity.y) * dt; 
             }
-
-            pos += Vector3(speed + velocity.x, 0, velocity.y) * dt;
             
-
-            
+                        
             // Camera
             Camera* camera = this->getCamera();
@@ -154 +155 @@
     void FlappyOrxShip::death()
     {
+        isDead = true;
         Vector3 pos = getPosition();
         pos.x = 0;