Made code -Wshadow clean, missed a bunch of issues in the last commit

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

diff --git a/src/supertux/levelintro.cpp b/src/supertux/levelintro.cpp
index f81d653..d20a4a7 100644 (file)
--- a/src/supertux/levelintro.cpp
+++ b/src/supertux/levelintro.cpp
@@ -16,7 +16,7 @@
 
 #include "supertux/levelintro.hpp"
 
-#include "control/joystickkeyboardcontroller.hpp"
+#include "control/input_manager.hpp"
 #include "math/random_generator.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/fadeout.hpp"
@@ -28,11 +28,11 @@
 #include <sstream>
 #include <boost/format.hpp>
 
-LevelIntro::LevelIntro(const Level* level, const Statistics* best_level_statistics) :
-  level(level), 
-  best_level_statistics(best_level_statistics), 
+LevelIntro::LevelIntro(const Level* level_, const Statistics* best_level_statistics_) :
+  level(level_),
+  best_level_statistics(best_level_statistics_),
   player_sprite(),
-  player_sprite_py(0), 
+  player_sprite_py(0),
   player_sprite_vy(0),
   player_sprite_jump_timer()
 {
@@ -53,14 +53,14 @@ LevelIntro::setup()
 void
 LevelIntro::update(float elapsed_time)
 {
-  Controller *controller = g_jk_controller->get_main_controller();
+  Controller *controller = g_input_manager->get_controller();
 
   // Check if it's time to exit the screen
   if(controller->pressed(Controller::JUMP)
      || controller->pressed(Controller::ACTION)
      || controller->pressed(Controller::MENU_SELECT)
      || controller->pressed(Controller::PAUSE_MENU)) {
-    g_screen_manager->exit_screen(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;
@@ -73,7 +73,7 @@ LevelIntro::update(float elapsed_time)
     player_sprite_vy = -300;
     player_sprite_jump_timer.start(graphicsRandom.randf(2,3));
   }
-  
+
 }
 
 void
@@ -123,7 +123,7 @@ LevelIntro::draw(DrawingContext& context)
     context.draw_center_text(Resources::normal_font, ss.str(), Vector(0, py), LAYER_FOREGROUND1,LevelIntro::stat_color);
     py += static_cast<int>(Resources::normal_font->get_height());
   }
-  
+
   {
     std::stringstream ss;
     ss << _("Secrets") << ": " << Statistics::secrets_to_string((best_level_statistics && (best_level_statistics->coins >= 0)) ? best_level_statistics->secrets : 0, stats.total_secrets);