-// $Id$
-//
// 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
// 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.
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <config.h>
+#include "trigger/secretarea_trigger.hpp"
-#include "secretarea_trigger.hpp"
-#include "game_session.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
-#include "main.hpp"
-#include "sector.hpp"
-#include "level.hpp"
-#include "gettext.hpp"
#include "object/tilemap.hpp"
+#include "supertux/level.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/resources.hpp"
+#include "supertux/sector.hpp"
+#include "util/gettext.hpp"
+#include "util/reader.hpp"
+#include "util/writer.hpp"
static const float MESSAGE_TIME=3.5;
-SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader)
- : fade_tilemap("")
+SecretAreaTrigger::SecretAreaTrigger(const Reader& reader) :
+ message_timer(),
+ message_displayed(),
+ fade_tilemap()
{
reader.get("x", bbox.p1.x);
reader.get("y", bbox.p1.y);
message_displayed = false;
}
-SecretAreaTrigger::SecretAreaTrigger(const Rect& area, std::string fade_tilemap)
- : fade_tilemap(fade_tilemap)
+SecretAreaTrigger::SecretAreaTrigger(const Rect& area, std::string fade_tilemap) :
+ message_timer(),
+ message_displayed(),
+ fade_tilemap(fade_tilemap)
{
bbox = area;
message_displayed = false;
}
void
-SecretAreaTrigger::write(lisp::Writer& writer)
-{
- writer.start_list("secretarea");
-
- writer.write("x", bbox.p1.x);
- writer.write("y", bbox.p1.y);
- writer.write("width", bbox.get_width());
- writer.write("height", bbox.get_height());
- writer.write("fade-tilemap", fade_tilemap);
-
- writer.end_list("secretarea");
-}
-
-void
SecretAreaTrigger::draw(DrawingContext& context)
{
if (message_timer.started()) {
}
IMPLEMENT_FACTORY(SecretAreaTrigger, "secretarea");
+
+/* EOF */