Changeset 12359 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

Timestamp:

May 9, 2019, 3:29:29 PM (5 years ago)

Author:

ahuwyler

Message:

fuer de jerome

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified) (5 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -170 +170 @@
 
         // Set variable to temporarily force the player to spawn.
+        // Set variable to temporarily force the player to spawn.
+        bool temp = this->bForceSpawn_;
         this->bForceSpawn_ = true;
 
@@ -175 +177 @@
         Deathmatch::start();
 
+        // Reset the variable.
+        this->bForceSpawn_ = temp;
+
     }
 
@@ -184 +189 @@
     {
         ChatManager::message("You suck!!");
+
+        if (Highscore::exists())
+        {
+            int score = this->getScore(this->getPlayer());
+            Highscore::getInstance().storeScore("Tetris", score, this->getPlayer());
+        }
+
         this->cleanup();
 
@@ -191 +203 @@
     }
 
-    OrxoBloxShip* OrxoBlox::getPlayer()
-    {
-        if (playership == nullptr)
-        {
-            for (OrxoBloxShip* ship_ : ObjectList<OrxoBloxShip>())
-            {
-                playership = ship_;
-            }
-        }
-        return playership;
+    PlayerInfo* OrxoBlox::getPlayer()
+    {
+        return this->player_;
     }
    
@@ -217 +222 @@
     void OrxoBlox::LevelUp(){
         level_++;
-
+        this->playerScored(this->player_);// add points
         for(OrxoBloxStones* stone : this->stones_){
             int x_=(stone->getPosition()).x;