Changeset 11729 for code/branches/Presentation_HS17_merge/src/modules/dodgerace/DodgeRace.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/dodgerace/DodgeRace.cc (modified) (6 diffs)

code/branches/Presentation_HS17_merge/src/modules/dodgerace/DodgeRace.cc

@@ -37 +37 @@
 #include "core/CoreIncludes.h"
 #include "Highscore.h"
+#include "infos/PlayerInfo.h"
 
 namespace orxonox
@@ -90 +91 @@
     void DodgeRace::tick(float dt)
     {
-        if (getPlayer() != nullptr)
-        {
-            currentPosition = getPlayer()->getWorldPosition().x;
+        DodgeRaceShip* player = this->getPlayer();
+        if (player != nullptr)
+        {
+            currentPosition = player->getWorldPosition().x;
             counter = counter + (currentPosition - lastPosition);
             lastPosition = currentPosition;
             point = (int) currentPosition;
-            getPlayer()->speed = 830.0f - (point / 1000);
+            player->speed = 830.0f - (point / 1000);
 
             for(unsigned int i=0; i < cubeList.size();i++)
@@ -123 +125 @@
                     }
 
-                    cube->setPosition(getPlayer()->getWorldPosition() + Vector3(5000.0f, 0.0f, -3600.0f + (i*1200)));
+                    cube->setPosition(player->getWorldPosition() + Vector3(5000.0f, 0.0f, -3600.0f + (i*1200)));
                     //stEntity->setScale3D(50,50,50);
                 }
@@ -139 +141 @@
     DodgeRaceShip* DodgeRace::getPlayer()
     {
-        if (player == nullptr)
-        {
-            for (DodgeRaceShip* ship : ObjectList<DodgeRaceShip>())
-            {
-                player = ship;
-            }
-        }
-        return player;
+        for (DodgeRaceShip* ship : ObjectList<DodgeRaceShip>())
+        {
+            return ship;
+        }
+        return nullptr;
     }
 
@@ -190 +189 @@
     void DodgeRace::playerPreSpawn(PlayerInfo* player)
     {
+        this->playerInfo_ = player;
         if(lives <= 0)
         {
@@ -228 +228 @@
         {
             int score = this->getPoints();
-            Highscore::getInstance().storeScore("Dodge Race", score, this->getPlayer()->getPlayer());
+            Highscore::getInstance().storeScore("Dodge Race", score, this->playerInfo_);
         }
         GSLevel::startMainMenu();