Changed egg shadow draw layer so it will no longer appear in front of bonusblocks...

[supertux.git] / src / supertux / levelset_screen.cpp

diff --git a/src/supertux/levelset_screen.cpp b/src/supertux/levelset_screen.cpp
index 0aec48a..dde3cd2 100644 (file)
--- a/src/supertux/levelset_screen.cpp
+++ b/src/supertux/levelset_screen.cpp
@@ -18,6 +18,7 @@
 
 #include "supertux/game_session.hpp"
 #include "supertux/globals.hpp"
+#include "supertux/levelset.hpp"
 #include "supertux/savegame.hpp"
 #include "supertux/screen_fade.hpp"
 #include "supertux/screen_manager.hpp"
@@ -31,6 +32,13 @@ LevelsetScreen::LevelsetScreen(const std::string& basedir, const std::string& le
   m_level_started(false),
   m_solved(false)
 {
+  Levelset levelset(basedir);
+  for(int i = 0; i < levelset.get_num_levels(); ++i)
+  {
+    std::string lev = levelset.get_level_filename(i);
+    m_savegame.set_levelset_state(m_basedir, lev, false);
+  }
+
   LevelsetState state = m_savegame.get_levelset_state(basedir);
   LevelState level_state = state.get_level_state(level_filename);
   m_solved = level_state.solved;
@@ -65,7 +73,7 @@ LevelsetScreen::setup()
     // this gets called when the GameSession is done and we return back to the
     m_savegame.set_levelset_state(m_basedir, m_level_filename, m_solved);
     m_savegame.save();
-    g_screen_manager->pop_screen();
+    ScreenManager::current()->pop_screen();
   }
   else
   {
@@ -73,7 +81,7 @@ LevelsetScreen::setup()
 
     std::unique_ptr<Screen> screen(new GameSession(FileSystem::join(m_basedir, m_level_filename),
                                                    m_savegame));
-    g_screen_manager->push_screen(std::move(screen));
+    ScreenManager::current()->push_screen(std::move(screen));
   }
 }