Fix: Loading a level in editor after playing a level causes crash

SuperTux · Mar 7, 2016 · 17c84d7 · 17c84d7
1 parent 0bd3196
commit 17c84d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
@@ -52,6 +52,7 @@ Editor::Editor() :
   save_request(false),
   test_request(false),
   currentsector(),
+  m_savegame(),
   levelloaded(false),
   leveltested(false),
   tileset(NULL),
@@ -303,6 +304,8 @@ Editor::setup() {
   MenuManager::instance().push_menu(MenuStorage::EDITOR_LEVELSET_SELECT_MENU);
   tileselect.setup();
   layerselect.setup();
+  m_savegame.reset(new Savegame("levels/misc"));
+  m_savegame->load();
 }
 
 void

diff --git a/src/editor/editor.hpp b/src/editor/editor.hpp
@@ -30,6 +30,7 @@
 #include "util/currenton.hpp"
 
 class Level;
+class Savegame;
 class Sector;
 class TileSet;
 class World;
@@ -68,6 +69,7 @@ class Editor : public Screen,
     }
 
     Sector* currentsector;
+    std::unique_ptr<Savegame> m_savegame;
 
     bool levelloaded;
     bool leveltested;

diff --git a/src/object/firefly.cpp b/src/object/firefly.cpp
@@ -60,6 +60,9 @@ Firefly::Firefly(const ReaderMapping& lisp) :
 void
 Firefly::reactivate()
 {
+  if (!GameSession::current()) {
+    return;
+  }
   if(!GameSession::current()->get_reset_point_sectorname().empty() &&
      GameSession::current()->get_reset_point_pos() == initial_position) {
     // TODO: && GameSession::current()->get_reset_point_sectorname() ==  <sector this firefly is in>

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
@@ -83,7 +83,16 @@ Sector::Sector(Level* parent) :
   camera(0),
   effect(0)
 {
-  add_object(std::make_shared<Player>(GameSession::current()->get_savegame().get_player_status(), "Tux"));
+  PlayerStatus* player_status;
+  if (EditorActive()) {
+    player_status = Editor::current()->m_savegame->get_player_status();
+  } else {
+    player_status = GameSession::current()->get_savegame().get_player_status();
+  }
+  if (!player_status) {
+    log_warning << "Player status is not initialized." << std::endl;
+  }
+  add_object(std::make_shared<Player>(player_status, "Tux"));
   add_object(std::make_shared<DisplayEffect>("Effect"));
   add_object(std::make_shared<TextObject>("Text"));