Changeset 11493 for code/trunk/src/modules/hover/HoverShip.cc

Timestamp:

Oct 16, 2017, 4:07:37 PM (7 years ago)

Author:

patricwi

Message:

Merged tgidronFS16

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/hover/HoverShip.cc (modified) (3 diffs)

code/trunk/src/modules/hover/HoverShip.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "Hover.h"
+//#include "NewHumanController.h"
 
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
@@ -112 +114 @@
         if (bBoost && this->isFloor_)
         {
+
             this->setVelocity(
                 this->getVelocity().x,
@@ -120 +123 @@
         }
     }
+
+    Hover* HoverShip::getGame()
+    {
+        if (game == nullptr)
+        {
+            for (Hover* hover : ObjectList<Hover>())
+                game = hover;
+        }
+        return game;
+    }
+
+    void HoverShip::death()
+    {
+        getGame()->costLife();
+        SpaceShip::death();
+    }
 }