Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix game load crash with unattached hyperspace clouds (#4555) 

* Fix game load crash with unattached hyperspace clouds

* Change a few 0s to nullptr
master
jaj22 2019-03-07 12:54:30 +00:00 committed by Andrew Copland
parent 5c0327c5fd
commit 288f3635fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/HyperspaceCloud.cpp
View File

@ -44,6 +44,7 @@ HyperspaceCloud::HyperspaceCloud(const Json &jsonObj, Space *space) :
m_due = hyperspaceCloudObj["due"];
m_isArrival = hyperspaceCloudObj["is_arrival"];
m_ship = nullptr;
if (hyperspaceCloudObj["ship"].is_object()) {
Json shipObj = hyperspaceCloudObj["ship"];
m_ship = static_cast<Ship *>(Body::FromJson(shipObj, space));
@ -111,7 +112,7 @@ void HyperspaceCloud::TimeStepUpdate(const float timeStep)
m_ship->EnterSystem();
m_ship = 0;
m_ship = nullptr;
}
// cloud expiration
@ -125,7 +126,7 @@ void HyperspaceCloud::TimeStepUpdate(const float timeStep)
Ship *HyperspaceCloud::EvictShip()
{
Ship *s = m_ship;
m_ship = 0;
m_ship = nullptr;
return s;
}