some cleanups memory leak fixes and moving of source files

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

diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp
index 2accfbb..b57624c 100644 (file)
--- a/src/trigger/secretarea_trigger.cpp
+++ b/src/trigger/secretarea_trigger.cpp
@@ -4,6 +4,9 @@
 #include "utils/lispwriter.h"
 #include "gameloop.h"
 
+#define MESSAGE_TIME 3.5
+
+//TODO: Count numbers of triggered/total secret areas
 SecretAreaTrigger::SecretAreaTrigger(LispReader& reader)
 {
   reader.read_float("x", bbox.p1.x);
@@ -11,15 +14,15 @@ SecretAreaTrigger::SecretAreaTrigger(LispReader& reader)
   bbox.set_size(32, 32);
 
   reader.read_string("message", message);
+  message_displayed = false;
 }
 
-SecretAreaTrigger::SecretAreaTrigger(const Vector& pos,
-    const std::string& secretarea)
+SecretAreaTrigger::SecretAreaTrigger(const Vector& pos)
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
-  triggerevent = EVENT_TOUCH;
-  show_message = 0;
+  message = "You found a secret area!";
+  message_displayed = false;
 }
 
 SecretAreaTrigger::~SecretAreaTrigger()
@@ -43,16 +46,25 @@ 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;
+    }
   }
 }