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

[supertux.git] / src / trigger / secretarea_trigger.hpp

diff --git a/src/trigger/secretarea_trigger.hpp b/src/trigger/secretarea_trigger.hpp
index 02186a0..e3d5916 100644 (file)
--- a/src/trigger/secretarea_trigger.hpp
+++ b/src/trigger/secretarea_trigger.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,34 +12,37 @@
 //  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 HEADER_SUPERTUX_TRIGGER_SECRETAREA_TRIGGER_HPP
+#define HEADER_SUPERTUX_TRIGGER_SECRETAREA_TRIGGER_HPP
+
+#include "trigger/trigger_base.hpp"
 
-#ifndef __SECRETAREA_TRIGGER_H__
-#define __SECRETAREA_TRIGGER_H__
+#include "supertux/timer.hpp"
+#include "util/reader_fwd.hpp"
+#include "util/writer_fwd.hpp"
 
-#include "trigger_base.hpp"
-#include "serializable.hpp"
-#include "resources.hpp"
-#include "video/drawing_context.hpp"
-#include "timer.hpp"
+class DrawingContext;
+class Color;
 
-class SecretAreaTrigger : public TriggerBase, public Serializable
+class SecretAreaTrigger : public TriggerBase
 {
+  static Color text_color;
 public:
-  SecretAreaTrigger(const lisp::Lisp& reader);
-  SecretAreaTrigger(const Rect& area);
+  SecretAreaTrigger(const Reader& reader);
+  SecretAreaTrigger(const Rect& area, std::string fade_tilemap = "");
   ~SecretAreaTrigger();
- 
-  void write(lisp::Writer& writer);
+
   void event(Player& player, EventType type);
   void draw(DrawingContext& context);
-  
+
 private:
-  std::string message;
   Timer message_timer;
   bool message_displayed;
+  std::string fade_tilemap; /**< tilemap to fade away when trigger is activated, or empty if you don't care */
 };
 
 #endif
 
+/* EOF */