X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fsecretarea_trigger.cpp;h=69c9d2a232130fa480658e8a2b95eb7851da11af;hb=9e3d8f3cc7a07ab4dae67e86c6f1d0e0e450fa54;hp=0420b09926105984a28c7b5c0c6b460fb5377228;hpb=3f1a54cc4a2b8deb8ebb31061a00ffcec5fb3169;p=supertux.git

diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp
index 0420b0992..69c9d2a23 100644
--- a/src/trigger/secretarea_trigger.cpp
+++ b/src/trigger/secretarea_trigger.cpp
@@ -1,25 +1,31 @@
 #include <config.h>
 
 #include "secretarea_trigger.h"
-#include "utils/lispwriter.h"
 #include "gameloop.h"
+#include "lisp/lisp.h"
+#include "lisp/writer.h"
 
-#define MESSAGE_TIME 3
+#define MESSAGE_TIME 3.5
 
-SecretAreaTrigger::SecretAreaTrigger(LispReader& reader)
+//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)
+SecretAreaTrigger::SecretAreaTrigger(const Rectangle& area)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
+  bbox = area;
   message = "You found a secret area!";
+  message_displayed = false;
 }
 
 SecretAreaTrigger::~SecretAreaTrigger()
@@ -27,7 +33,7 @@ SecretAreaTrigger::~SecretAreaTrigger()
 }
 
 void
-SecretAreaTrigger::write(LispWriter& writer)
+SecretAreaTrigger::write(lisp::Writer& writer)
 {
   writer.start_list("secretarea");
 
@@ -44,9 +50,11 @@ void
 SecretAreaTrigger::draw(DrawingContext& context)
 {
    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);
-      //TODO: Prevent text from scrolling with the rest of the level
+      context.pop_transform();
    }
    if (message_timer.check()) {
       remove_me();
@@ -57,6 +65,11 @@ void
 SecretAreaTrigger::event(Player& , EventType type)
 {
   if(type == EVENT_TOUCH) {
-    message_timer.start(MESSAGE_TIME);
+    if (!message_displayed) {
+      message_timer.start(MESSAGE_TIME);
+      message_displayed = true;
+    }
   }
 }
+
+//IMPLEMENT_FACTORY(SecretAreaTrigger, "secretarea_trigger")