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 c1ad71f..0ab963f 100644 (file)
--- a/src/object/level_time.cpp
+++ b/src/object/level_time.cpp
@@ -1,48 +1,79 @@
-#include <config.h>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "level_time.hpp"
+#include "object/level_time.hpp"
 
-#include <stdexcept>
-#include <iostream>
-#include "main.hpp"
-#include "resources.hpp"
-#include "sector.hpp"
-#include "gettext.hpp"
-#include "object_factory.hpp"
 #include "object/player.hpp"
+#include "scripting/level_time.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/resources.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
-#include "lisp/list_iterator.hpp"
+
+#include <math.h>
 
 /** When to alert player they're low on time! */
 static const float TIME_WARNING = 20;
 
-LevelTime::LevelTime(const lisp::Lisp& reader)
-: final_level_time(0.f), final_remaining_time(0.f)
+LevelTime::LevelTime(const Reader& reader) :
+  time_surface(),
+  running(true),
+  time_left(0)
 {
-    float time = -1;
-    lisp::ListIterator iter(&reader);
-    while(iter.next()) {
-        if(iter.item() == "time") {
-            iter.value()->get(time);
-            break;
-        } else {
-            std::cerr << "Unknown token '" << iter.item() 
-                      << "' in LevelTime object.\n";
-        }
-    }
-    if(time < 0)
-      throw std::runtime_error("Invalid leveltime specified");
-    time_left.start(time);
+  reader.get("name", name);
+  reader.get("time", time_left);
+  if(time_left <= 0) throw std::runtime_error("No or invalid leveltime specified");
+  time_surface = Surface::create("images/engine/hud/time-0.png");
 }
 
-LevelTime::~LevelTime()
-{}
+void
+LevelTime::expose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+  if (name.empty()) return;
+  scripting::LevelTime* _this = new scripting::LevelTime(this);
+  expose_object(vm, table_idx, _this, name, true);
+}
 
 void
-LevelTime::update(float )
+LevelTime::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if(time_left.check()) {
-    Sector::current()->player->kill(Player::KILL);
+  if (name.empty()) return;
+  scripting::unexpose_object(vm, table_idx, name);
+}
+
+void
+LevelTime::update(float elapsed_time)
+{
+  if (!running) return;
+
+  int prev_time = (int) floor(time_left*5);
+  time_left -= elapsed_time;
+  if(time_left <= 0) {
+    if(time_left <= -5 || !Sector::current()->player->get_coins())
+    {
+      Sector::current()->player->kill(true);
+      stop();
+    }
+    if(prev_time != (int) floor(time_left*5))
+    {
+      Sector::current()->player->add_coins(-1);
+    }
   }
 }
 
@@ -52,45 +83,46 @@ LevelTime::draw(DrawingContext& context)
   context.push_transform();
   context.set_translation(Vector(0, 0));
 
-  char str[60];
-    
-  if(get_remaining_time() < 0) {
-    context.draw_text(white_text, _("TIME's UP"), Vector(SCREEN_WIDTH/2, BORDER_Y),
-        CENTER_ALLIGN, LAYER_FOREGROUND1);
-  } else if (get_remaining_time() > TIME_WARNING
-      || int(game_time * 2.5) % 2) {
-    snprintf(str, sizeof(str), " %d", int(get_remaining_time()));
-    context.draw_text(white_text, _("TIME"),
-        Vector(SCREEN_WIDTH/2, BORDER_Y), CENTER_ALLIGN, LAYER_FOREGROUND1);
-    context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2 + 4*16, BORDER_Y),
-                      CENTER_ALLIGN, LAYER_FOREGROUND1);
+  if ((time_left > TIME_WARNING) || (int(game_time * 2.5) % 2)) {
+    std::stringstream ss;
+    ss << int(time_left);
+    std::string time_text = ss.str();
+
+    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);
+    }
   }
 
   context.pop_transform();
 }
 
-float
-LevelTime::get_level_time()
+void
+LevelTime::start()
 {
-  if (!time_left.started())
-    return final_level_time;
-  return time_left.get_period();
+  running = true;
+}
+
+void
+LevelTime::stop()
+{
+  running = false;
 }
 
 float
-LevelTime::get_remaining_time()
+LevelTime::get_time()
 {
-  if (!time_left.started())
-    return final_remaining_time;
-  return time_left.get_timeleft();
+  return time_left;
 }
 
 void
-LevelTime::stop()
+LevelTime::set_time(float time_left_)
 {
-  final_level_time = time_left.get_period();
-  final_remaining_time = time_left.get_timeleft();
-  time_left.stop();
+  this->time_left = std::min(std::max(time_left_, 0.0f), 999.0f);
 }
 
-IMPLEMENT_FACTORY(LevelTime, "leveltime");
+/* EOF */