Changeset 11729 for code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc

Timestamp:

Feb 11, 2018, 4:49:56 PM (6 years ago)

Author:

landauf

Message:

fixed crash when setting highscore

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified) (6 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc

@@ -59 +59 @@
 #include "Highscore.h"
 #include "gamestates/GSLevel.h"
+#include "infos/PlayerInfo.h"
 
 namespace orxonox
@@ -124 +125 @@
         if(this->firstTick_)
         {
-            getPlayer();
             for(int i = 0; i < 5; ++i)
             {
@@ -141 +141 @@
         //stones are created with a size -> second constructor in Asteroids2DStone class
         Asteroids2DStone* newStone = new Asteroids2DStone(this->center_->getContext());
-        newStone->setAsteroids2DPlayer(player);
 
         //look at templates in data/levels/templates/asteroidsAsteroids2D.oxt
@@ -163 +162 @@
     Asteroids2DShip* Asteroids2D::getPlayer()
     {
-        if (player == nullptr)
-        {
-            for (Asteroids2DShip* ship : ObjectList<Asteroids2DShip>())
-            {
-                player = ship;
-            }
-        }
-        return player;
+        for (Asteroids2DShip* ship : ObjectList<Asteroids2DShip>())
+        {
+            return ship;
+        }
+        return nullptr;
     }
 
@@ -201 +197 @@
     void Asteroids2D::playerPreSpawn(PlayerInfo* player)
     {
+        this->playerInfo_ = player;
         if(lives <= 0)
         {
@@ -226 +223 @@
         {
             int score = this->getPoints();
-            Highscore::getInstance().storeScore("Asteroids2D", score, this->getPlayer()->getPlayer());
+            Highscore::getInstance().storeScore("Asteroids2D", score, this->playerInfo_);
         }
         GSLevel::startMainMenu();