Changeset 11783 for code/trunk/src/modules/superorxobros/SOB.cc

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/superorxobros/SOB.cc (modified) (9 diffs, 1 prop)

code/trunk/src/modules/superorxobros/SOB.cc

@@ -44 +44 @@
 #include "SOBFigure.h"
 #include "graphics/Camera.h"
+#include "Highscore.h"
 
 
@@ -49 +50 @@
 namespace orxonox
 {
-
+    bool newHighscore=0;
     RegisterUnloadableClass(SOB);
 
@@ -59 +60 @@
     {
         RegisterObject(SOB);
-        camera = nullptr;
 
         this->center_ = nullptr;
@@ -68 +68 @@
         timeLeft_=400.0;
         done_ = true;
+        newHighscore = false;
         lvl_ = 1;
 
@@ -78 +79 @@
     SOB::~SOB()
     {
-        if (this->isInitialized())
-            this->cleanup();
     }
-
-    void SOB::cleanup()
-    {
-        camera = nullptr;
-    }
-
-
 
     void SOB::start()
@@ -99 +91 @@
             }
 
-            center_->attach(figure_);
             figure_->setPosition(0, 0, 0);
         }
@@ -112 +103 @@
         Gametype::start();
 
-        if (figure_ != nullptr)
-        {
-            camera = figure_->getCamera();
-        }
-
     }
 
     void SOB::end()
     {
-        cleanup();
         GSLevel::startMainMenu();
         Deathmatch::end();
-    }
+}
 
     void SOB::restart() {
-        cleanup();
-
         // HACK - only method I found to simply reload the level
         Game::getInstance().popState();
@@ -167 +150 @@
         if (this->figure_ != nullptr && figure_->lvlEnded_) {
             std::stringstream a;
-            a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            if(!newHighscore){
+                a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            }
+            else{
+                a << "Congrats, new Highscore! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            }
             info_ =a.str();
 
@@ -181 +169 @@
         //The time on the HUD
         if (!done_)
-            timeLeft_-=dt*2.5;
+            timeLeft_-=dt*2.5f;
     }