Changeset 11412 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc

Timestamp:

May 4, 2017, 3:17:59 PM (8 years ago)

Author:

jkindle

Message:

Fixed turning, added and finished Gumbas, added turnOnCollide for all NPC and items, added Flagstone - todo: add points on flagstone hit and go into a between lvl mode, then warp to lvl 2. AAH, and added onDeath fcts…

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc (modified) (5 diffs)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc

@@ -38 +38 @@
 #include "core/command/Executor.h"
 #include "core/config/ConfigValueIncludes.h"
+#include "core/Game.h"
 
 #include "gamestates/GSLevel.h"
@@ -68 +69 @@
         points_=0;
         timeLeft_=400.0;
+        
+        lvl_ = 1;
 
     }
@@ -86 +89 @@
     }
 
-        void SOB::start()
+    void SOB::start()
     {
         if (center_ != nullptr) // There needs to be a SOBCenterpoint, i.e. the area the game takes place.
@@ -125 +128 @@
     }
 
+    void SOB::restart() {
+        cleanup();
+
+        // HACK
+        Game::getInstance().popState();
+        Game::getInstance().popState();
+        Game::getInstance().requestStates("standalone, level");
+
+        
+    }
     void SOB::spawnPlayer(PlayerInfo* player)
     {
@@ -148 +161 @@
     }
 
-void SOB::tick(float dt)
+    void SOB::tick(float dt)
     {
         SUPER(SOB, tick, dt);
 
-        if (this->figure_ != nullptr && figure_->dead_)
+        if (this->figure_ != nullptr && figure_->dead_) {
+            info_ = "Game over. Press <Space> to restart";
             orxout() << "DEED" << endl;
-       
+        }
+        
 
-       timeLeft_-=dt*2.5;
+        timeLeft_-=dt*2.5;
     }