X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fsecretarea_trigger.cpp;h=5718ac990b2fc890c58b65ee0c06d9299b3161d8;hb=ab82bfad847516c0e9af45089f82ccaaefc7a47b;hp=2accfbb9ef89ef4d1c254d58db3da7415132733f;hpb=3df54471553ec420c83fc1c22d4c939f522395fe;p=supertux.git

diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp
index 2accfbb9e..5718ac990 100644
--- a/src/trigger/secretarea_trigger.cpp
+++ b/src/trigger/secretarea_trigger.cpp
@@ -1,25 +1,32 @@
 #include <config.h>
 
 #include "secretarea_trigger.h"
-#include "utils/lispwriter.h"
 #include "gameloop.h"
+#include "lisp/lisp.h"
+#include "lisp/writer.h"
+#include "object_factory.h"
 
-SecretAreaTrigger::SecretAreaTrigger(LispReader& reader)
+#define MESSAGE_TIME 3.5
+
+//TODO: Count numbers of triggered/total secret areas
+SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader)
 {
-  reader.read_float("x", bbox.p1.x);
-  reader.read_float("y", bbox.p1.y);
-  bbox.set_size(32, 32);
+  reader.get("x", bbox.p1.x);
+  reader.get("y", bbox.p1.y);
+  float w = 32, h = 32;
+  reader.get("width", w);
+  reader.get("height", h);
+  bbox.set_size(w, h);
 
-  reader.read_string("message", message);
+  reader.get("message", message);
+  message_displayed = false;
 }
 
-SecretAreaTrigger::SecretAreaTrigger(const Vector& pos,
-    const std::string& secretarea)
+SecretAreaTrigger::SecretAreaTrigger(const Rectangle& area)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  triggerevent = EVENT_TOUCH;
-  show_message = 0;
+  bbox = area;
+  message = "You found a secret area!";
+  message_displayed = false;
 }
 
 SecretAreaTrigger::~SecretAreaTrigger()
@@ -27,7 +34,7 @@ SecretAreaTrigger::~SecretAreaTrigger()
 }
 
 void
-SecretAreaTrigger::write(LispWriter& writer)
+SecretAreaTrigger::write(lisp::Writer& writer)
 {
   writer.start_list("secretarea");
 
@@ -43,16 +50,27 @@ SecretAreaTrigger::write(LispWriter& writer)
 void
 SecretAreaTrigger::draw(DrawingContext& context)
 {
-   if (show_message == 1) {
-      context.draw_center_text(gold_text, message, Vector(0, screen->h/2 - gold_text->get_height()/2), LAYER_GUI);
-      std::cout<<message<<std::endl;
+   if (message_timer.started()) {
+      context.push_transform();
+      context.set_translation(Vector(0, 0));
+      Vector pos = Vector(0, screen->h/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();
    }
 }
 
 void
 SecretAreaTrigger::event(Player& , EventType type)
 {
-  if(type == triggerevent) {
-    show_message = 1;
+  if(type == EVENT_TOUCH) {
+    if (!message_displayed) {
+      message_timer.start(MESSAGE_TIME);
+      message_displayed = true;
+    }
   }
 }
+
+IMPLEMENT_FACTORY(SecretAreaTrigger, "secretarea");