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

[supertux.git] / src / object / level_time.cpp

diff --git a/src/object/level_time.cpp b/src/object/level_time.cpp
index 6f096b0..0ab963f 100644 (file)
--- a/src/object/level_time.cpp
+++ b/src/object/level_time.cpp
@@ -33,7 +33,7 @@ static const float TIME_WARNING = 20;
 
 LevelTime::LevelTime(const Reader& reader) :
   time_surface(),
-  running(true), 
+  running(true),
   time_left(0)
 {
   reader.get("name", name);
@@ -46,8 +46,8 @@ void
 LevelTime::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   if (name.empty()) return;
-  scripting::LevelTime* interface = new scripting::LevelTime(this);
-  expose_object(vm, table_idx, interface, name, true);
+  scripting::LevelTime* _this = new scripting::LevelTime(this);
+  expose_object(vm, table_idx, _this, name, true);
 }
 
 void
@@ -88,11 +88,13 @@ LevelTime::draw(DrawingContext& context)
     ss << int(time_left);
     std::string time_text = ss.str();
 
-    Surface* time_surf = time_surface.get();
-    if (time_surf) {
-      float all_width = time_surf->get_width() + Resources::normal_font->get_text_width(time_text);
-      context.draw_surface(time_surf, Vector((SCREEN_WIDTH - all_width)/2, BORDER_Y + 1), LAYER_FOREGROUND1);
-      context.draw_text(Resources::normal_font, time_text, Vector((SCREEN_WIDTH - all_width)/2 + time_surf->get_width(), BORDER_Y), ALIGN_LEFT, LAYER_FOREGROUND1, LevelTime::text_color);
+    if (time_surface)
+    {
+      float all_width = time_surface->get_width() + Resources::normal_font->get_text_width(time_text);
+      context.draw_surface(time_surface, Vector((SCREEN_WIDTH - all_width)/2, BORDER_Y + 1), LAYER_FOREGROUND1);
+      context.draw_text(Resources::normal_font, time_text,
+                        Vector((SCREEN_WIDTH - all_width)/2 + time_surface->get_width(), BORDER_Y),
+                        ALIGN_LEFT, LAYER_FOREGROUND1, LevelTime::text_color);
     }
   }
 
@@ -118,11 +120,9 @@ LevelTime::get_time()
 }
 
 void
-LevelTime::set_time(float time_left)
+LevelTime::set_time(float time_left_)
 {
-  this->time_left = std::min(std::max(time_left, 0.0f), 999.0f);
+  this->time_left = std::min(std::max(time_left_, 0.0f), 999.0f);
 }
 
-IMPLEMENT_FACTORY(LevelTime, "leveltime");
-
 /* EOF */