projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched from tinygettext/tags/tinygetext-supertux/ to tinygettext/trunk/
[supertux.git]
/
src
/
object
/
level_time.cpp
diff --git
a/src/object/level_time.cpp
b/src/object/level_time.cpp
index
65a8e36
..
26de88d
100644
(file)
--- a/
src/object/level_time.cpp
+++ b/
src/object/level_time.cpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// 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 2
-//
of the License, or
(at your option) any later version.
+// 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
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,33
+12,29
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-#include <config.h>
+// 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 <sstream>
-#include "main.hpp"
-#include "resources.hpp"
-#include "sector.hpp"
-#include "gettext.hpp"
-#include "object_factory.hpp"
#include "object/player.hpp"
#include "object/player.hpp"
-#include "video/drawing_context.hpp"
-#include "lisp/list_iterator.hpp"
-#include "log.hpp"
#include "scripting/level_time.hpp"
#include "scripting/squirrel_util.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 <math.h>
/** When to alert player they're low on time! */
static const float TIME_WARNING = 20;
/** When to alert player they're low on time! */
static const float TIME_WARNING = 20;
-LevelTime::LevelTime(const lisp::Lisp& reader)
-: running(true), time_left(0)
+LevelTime::LevelTime(const Reader& reader) :
+ time_surface(),
+ running(true),
+ time_left(0)
{
reader.get("name", name);
reader.get("time", time_left);
{
reader.get("name", name);
reader.get("time", time_left);
@@
-96,9
+90,9
@@
LevelTime::draw(DrawingContext& context)
Surface* time_surf = time_surface.get();
if (time_surf) {
Surface* time_surf = time_surface.get();
if (time_surf) {
- float all_width = time_surf->get_width() +
white_tex
t->get_text_width(time_text);
+ float all_width = time_surf->get_width() +
normal_fon
t->get_text_width(time_text);
context.draw_surface(time_surf, Vector((SCREEN_WIDTH - all_width)/2, BORDER_Y + 1), LAYER_FOREGROUND1);
context.draw_surface(time_surf, Vector((SCREEN_WIDTH - all_width)/2, BORDER_Y + 1), LAYER_FOREGROUND1);
- context.draw_text(
gold_text, time_text, Vector((SCREEN_WIDTH - all_width)/2 + time_surf->get_width(), BORDER_Y), LEFT_ALLIGN, LAYER_FOREGROUND1
);
+ context.draw_text(
normal_font, time_text, Vector((SCREEN_WIDTH - all_width)/2 + time_surf->get_width(), BORDER_Y), ALIGN_LEFT, LAYER_FOREGROUND1, LevelTime::text_color
);
}
}
}
}
@@
-116,8
+110,8
@@
LevelTime::stop()
{
running = false;
}
{
running = false;
}
-
-float
+
+float
LevelTime::get_time()
{
return time_left;
LevelTime::get_time()
{
return time_left;
@@
-130,3
+124,5
@@
LevelTime::set_time(float time_left)
}
IMPLEMENT_FACTORY(LevelTime, "leveltime");
}
IMPLEMENT_FACTORY(LevelTime, "leveltime");
+
+/* EOF */