Merge branch 'feature/screenmanager'

SuperTux · Aug 12, 2014 · 237822a · 237822a
2 parents 528cca3 + 9d6e6cb
commit 237822a
Show file tree

Hide file tree

Showing 9 changed files with 173 additions and 115 deletions.
diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp
@@ -64,12 +64,12 @@ void wait(HSQUIRRELVM vm, float seconds)
 
 void wait_for_screenswitch(HSQUIRRELVM vm)
 {
-  g_screen_manager->waiting_threads.add(vm);
+  g_screen_manager->m_waiting_threads.add(vm);
 }
 
 void exit_screen()
 {
-  g_screen_manager->exit_screen();
+  g_screen_manager->pop_screen();
 }
 
 void fadeout_screen(float seconds)

diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp
@@ -123,7 +123,7 @@ GameSession::restart_level()
     }
   } catch(std::exception& e) {
     log_fatal << "Couldn't start level: " << e.what() << std::endl;
-    g_screen_manager->exit_screen();
+    g_screen_manager->pop_screen();
     return (-1);
   }
 
@@ -252,7 +252,7 @@ void
 GameSession::abort_level()
 {
   MenuManager::instance().clear_menu_stack();
-  g_screen_manager->exit_screen();
+  g_screen_manager->pop_screen();
   currentsector->player->set_bonus(bonus_at_start);
   PlayerStatus *currentStatus = get_player_status();
   currentStatus->coins = coins_at_start;
@@ -488,7 +488,7 @@ GameSession::finish(bool win)
       WorldMap::current()->finished_level(level.get());
   }
 
-  g_screen_manager->exit_screen();
+  g_screen_manager->pop_screen();
 }
 
 void

diff --git a/src/supertux/levelintro.cpp b/src/supertux/levelintro.cpp
@@ -60,7 +60,7 @@ LevelIntro::update(float elapsed_time)
      || controller->pressed(Controller::ACTION)
      || controller->pressed(Controller::MENU_SELECT)
      || controller->pressed(Controller::PAUSE_MENU)) {
-    g_screen_manager->exit_screen(std::unique_ptr<ScreenFade>(new FadeOut(0.1)));
+    g_screen_manager->pop_screen(std::unique_ptr<ScreenFade>(new FadeOut(0.1)));
   }
 
   player_sprite_py += player_sprite_vy * elapsed_time;

diff --git a/src/supertux/menu/worldmap_menu.cpp b/src/supertux/menu/worldmap_menu.cpp
@@ -44,7 +44,7 @@ WorldmapMenu::check_menu()
 
     case MNID_QUITWORLDMAP:
       MenuManager::instance().clear_menu_stack();
-      g_screen_manager->exit_screen();
+      g_screen_manager->pop_screen();
       break;
   }
 }