Changeset 11766 for code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc

Timestamp:

Feb 18, 2018, 4:02:50 PM (7 years ago)

Author:

landauf

Message:

merged SOBv2_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

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

code/branches/Presentation_HS17_merge/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);
 
@@ -124 +125 @@
         GSLevel::startMainMenu();
         Deathmatch::end();
-    }
+}
 
     void SOB::restart() {
@@ -167 +168 @@
         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();