Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / trigger / sequence_trigger.cpp

diff --git a/src/trigger/sequence_trigger.cpp b/src/trigger/sequence_trigger.cpp
index 5787019..3ea5372 100644 (file)
--- a/src/trigger/sequence_trigger.cpp
+++ b/src/trigger/sequence_trigger.cpp
@@ -1,12 +1,10 @@
-//  $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
@@ -14,19 +12,14 @@
 //  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 "sequence_trigger.hpp"
-#include "game_session.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
+#include "object/player.hpp"
+#include "supertux/object_factory.hpp"
+#include "trigger/sequence_trigger.hpp"
+#include "util/reader.hpp"
 
-SequenceTrigger::SequenceTrigger(const lisp::Lisp& reader)
+SequenceTrigger::SequenceTrigger(const Reader& reader)
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
@@ -51,20 +44,6 @@ SequenceTrigger::~SequenceTrigger()
 }
 
 void
-SequenceTrigger::write(lisp::Writer& writer)
-{
-  writer.start_list("sequencetrigger");
-
-  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("sequence", sequence_name);
-
-  writer.end_list("sequencetrigger");
-}
-
-void
 SequenceTrigger::event(Player& player, EventType type)
 {
   if(type == triggerevent) {
@@ -72,4 +51,6 @@ SequenceTrigger::event(Player& player, EventType type)
   }
 }
 
-IMPLEMENT_FACTORY(SequenceTrigger, "sequencetrigger")
+IMPLEMENT_FACTORY(SequenceTrigger, "sequencetrigger");
+
+/* EOF */