X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fscripttrigger.cpp;h=50aa75f37ce927e496ca8ebe0f60d8911aead66b;hb=9ea35748100d9feb67a66f8a6656cc60f41bfa8c;hp=afac8aeb9d50efaf55fdbf7c5a7a64dd6fd56eb0;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/trigger/scripttrigger.cpp b/src/trigger/scripttrigger.cpp
index afac8aeb9..50aa75f37 100644
--- a/src/trigger/scripttrigger.cpp
+++ b/src/trigger/scripttrigger.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,23 +12,20 @@
 //  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 <memory>
 #include <sstream>
 #include <stdexcept>
-#include <memory>
 
-#include "scripttrigger.hpp"
-#include "game_session.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
-#include "sector.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "trigger/scripttrigger.hpp"
+#include "util/reader.hpp"
 
-ScriptTrigger::ScriptTrigger(const lisp::Lisp& reader)
+ScriptTrigger::ScriptTrigger(const Reader& reader) :
+  triggerevent(),
+  script()
 {
   bool must_activate = false;
 
@@ -52,7 +47,9 @@ ScriptTrigger::ScriptTrigger(const lisp::Lisp& reader)
     triggerevent = EVENT_TOUCH;
 }
 
-ScriptTrigger::ScriptTrigger(const Vector& pos, const std::string& script)
+ScriptTrigger::ScriptTrigger(const Vector& pos, const std::string& script) :
+  triggerevent(),
+  script()
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
@@ -65,21 +62,6 @@ ScriptTrigger::~ScriptTrigger()
 }
 
 void
-ScriptTrigger::write(lisp::Writer& writer)
-{
-  writer.start_list("scripttrigger");
-
-  writer.write_float("x", bbox.p1.x);
-  writer.write_float("y", bbox.p1.y);
-  writer.write_float("width", bbox.get_width());
-  writer.write_float("height", bbox.get_height());
-  writer.write_string("script", script);
-  writer.write_bool("button", (triggerevent == EVENT_ACTIVATE) ? true : false);
-
-  writer.end_list("scripttrigger");
-}
-
-void
 ScriptTrigger::event(Player& , EventType type)
 {
   if(type != triggerevent)
@@ -90,3 +72,5 @@ ScriptTrigger::event(Player& , EventType type)
 }
 
 IMPLEMENT_FACTORY(ScriptTrigger, "scripttrigger");
+
+/* EOF */