X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftrigger%2Fscripttrigger.hpp;h=e93824d222545aed7fb216e34dccbf4108b51ca2;hb=84c71f11f1e47729777d6ad783f4d30b5894d7bc;hp=edf03946e909b0211936e774a580392e074a02b7;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/trigger/scripttrigger.hpp b/src/trigger/scripttrigger.hpp
index edf03946e..e93824d22 100644
--- a/src/trigger/scripttrigger.hpp
+++ b/src/trigger/scripttrigger.hpp
@@ -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,28 +12,28 @@
 //  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/>.
 
-#ifndef __SCRIPTTRIGGER_H__
-#define __SCRIPTTRIGGER_H__
+#ifndef HEADER_SUPERTUX_TRIGGER_SCRIPTTRIGGER_HPP
+#define HEADER_SUPERTUX_TRIGGER_SCRIPTTRIGGER_HPP
 
-#include "trigger_base.hpp"
-#include "serializable.hpp"
+#include "trigger/trigger_base.hpp"
 
-class ScriptTrigger : public TriggerBase, public Serializable
+class ScriptTrigger : public TriggerBase
 {
 public:
-  ScriptTrigger(const lisp::Lisp& reader);
+  ScriptTrigger(const Reader& reader);
   ScriptTrigger(const Vector& pos, const std::string& script);
   ~ScriptTrigger();
-  
-  void write(lisp::Writer& writer);
+
+  void write(Writer& writer);
   void event(Player& player, EventType type);
-  
+
 private:
   EventType triggerevent;
   std::string script;
 };
 
 #endif
+
+/* EOF */