Changeset 9868 for code/branches/invaders/src/modules/invader/InvaderShip.cc

Timestamp:

Dec 3, 2013, 8:18:15 PM (12 years ago)

Author:

zifloria

Message:

End game screen. Eye candy. Gameplay tweaks

File:

• code/branches/invaders/src/modules/invader/InvaderShip.cc (modified) (6 diffs)

code/branches/invaders/src/modules/invader/InvaderShip.cc

@@ -42 +42 @@
     RegisterClass(InvaderShip);
 
-    /**
-    @brief
-        Constructor. Registers and initializes the object.
-    */
     InvaderShip::InvaderShip(Context* context) : SpaceShip(context)
     {
@@ -78 +74 @@
             if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
                 velocity.x = 0;
-            // this->setVelocity(Vector3(1000 + velocity.y, 0, velocity.x));
             pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
         }
 
+        // shoot!
         if (isFireing)
             ControllableEntity::fire(0);
@@ -91 +87 @@
             camera->setPosition(Vector3(-pos.z, -posforeward, 0));
             camera->setOrientation(Vector3::UNIT_Z, Degree(90));
-            // orxout() << "asbhajskjasjahg" << pos << endl;
         }
 
@@ -97 +92 @@
 
         // bring back on track!
-        // if (pos.z > 42*2.5)
-        //     pos.z = 42*2.5;
-        // else if (pos.z < -42*3)
-        //     pos.z = -42*3;
         if(pos.y != 0)
             pos.y = 0;
-            
 
         setPosition(pos);
@@ -122 +112 @@
         lastTime = 0;
         if (getGame())
-        {
             getGame()->levelUp();
-            // SmartPtr<Invader> game = orxonox_cast<Invader>(getGametype());
-            
-        }
-        //level++
     }
 
@@ -144 +129 @@
     {
         isFireing = bBoost;
+        // restart if game ended
+        if (getGame())
+            if (getGame()->bEndGame)
+                getGame()->start();
     }
     inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
-
         WeakPtr<InvaderEnemy> enemy = orxonox_cast<InvaderEnemy*>(otherObject);
+        // ensure that this gets only called once per enemy.
         if (enemy != NULL && lastEnemy != enemy)
         {
             lastEnemy = enemy;
-            orxout() << "Enemy!!!! " << endl;
+
             removeHealth(20);
-            if (getHealth() <= 0)
+            if (getGame())
             {
-                orxout() << "DIED!!!! " << endl;
-                if (getGame())
-                {
-                    getGame()->costLife();
-                    // SmartPtr<Invader> game = orxonox_cast<Invader>(getGametype());
-                    
-                }
+                getGame()->multiplier = 1;
+                if (getHealth() <= 0)
+                    getGame()->costLife();                    
             }
             return false;