X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fsecretarea_trigger.cpp;h=1c4649578e8fc0dd1db008a8beddda0965f7a547;hb=fea3446f05e1e7673607b835c269d3e8d1929ab3;hp=66a7f2e595323342ab35a3ae302dd84117d01a17;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp
index 66a7f2e59..1c4649578 100644
--- a/src/trigger/secretarea_trigger.cpp
+++ b/src/trigger/secretarea_trigger.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,24 +12,28 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
-#include "secretarea_trigger.h"
-#include "game_session.h"
-#include "lisp/lisp.h"
-#include "lisp/writer.h"
-#include "object_factory.h"
+#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"
 
-#define MESSAGE_TIME 3.5
+static const float MESSAGE_TIME=3.5;
 
-//TODO: Count numbers of triggered/total secret areas
 SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader)
+	: fade_tilemap("")
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
@@ -37,15 +41,15 @@ SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader)
   reader.get("width", w);
   reader.get("height", h);
   bbox.set_size(w, h);
+  reader.get("fade-tilemap", fade_tilemap);
 
-  reader.get("message", message);
   message_displayed = false;
 }
 
-SecretAreaTrigger::SecretAreaTrigger(const Rectangle& area)
+SecretAreaTrigger::SecretAreaTrigger(const Rect& area, std::string fade_tilemap)
+	: fade_tilemap(fade_tilemap)
 {
   bbox = area;
-  message = "You found a secret area!";
   message_displayed = false;
 }
 
@@ -62,7 +66,7 @@ SecretAreaTrigger::write(lisp::Writer& writer)
   writer.write_float("y", bbox.p1.y);
   writer.write_float("width", bbox.get_width());
   writer.write_float("height", bbox.get_height());
-  writer.write_string("message", message);
+  writer.write_string("fade-tilemap", fade_tilemap);
 
   writer.end_list("secretarea");
 }
@@ -70,16 +74,16 @@ SecretAreaTrigger::write(lisp::Writer& writer)
 void
 SecretAreaTrigger::draw(DrawingContext& context)
 {
-   if (message_timer.started()) {
-      context.push_transform();
-      context.set_translation(Vector(0, 0));
-      Vector pos = Vector(0, SCREEN_HEIGHT/2 - gold_text->get_height()/2);
-      context.draw_center_text(gold_text, message, pos, LAYER_GUI);
-      context.pop_transform();
-   }
-   if (message_timer.check()) {
-      remove_me();
-   }
+  if (message_timer.started()) {
+    context.push_transform();
+    context.set_translation(Vector(0, 0));
+    Vector pos = Vector(0, SCREEN_HEIGHT/2 - gold_text->get_height()/2);
+    context.draw_center_text(gold_text, _("You found a secret area!"), pos, LAYER_GUI);
+    context.pop_transform();
+  }
+  if (message_timer.check()) {
+    remove_me();
+  }
 }
 
 void
@@ -89,6 +93,19 @@ SecretAreaTrigger::event(Player& , EventType type)
     if (!message_displayed) {
       message_timer.start(MESSAGE_TIME);
       message_displayed = true;
+      Sector::current()->get_level()->stats.secrets++;
+
+      if (fade_tilemap != "") {
+	// fade away tilemaps
+	Sector& sector = *Sector::current();
+	for(Sector::GameObjects::iterator i = sector.gameobjects.begin(); i != sector.gameobjects.end(); ++i) {
+	  TileMap* tm = dynamic_cast<TileMap*>(*i);
+	  if (!tm) continue;
+	  if (tm->get_name() != fade_tilemap) continue;
+	  tm->fade(0.0, 1.0);
+	}
+      }
+
     }
   }
 }