Turned a lot of other global objects into Currentons

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

diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp
index 68c0a85..3356099 100644 (file)
--- a/src/trigger/secretarea_trigger.cpp
+++ b/src/trigger/secretarea_trigger.cpp
@@ -18,7 +18,7 @@
 
 #include "object/tilemap.hpp"
 #include "supertux/level.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/sector.hpp"
@@ -29,7 +29,11 @@
 static const float MESSAGE_TIME=3.5;
 
 SecretAreaTrigger::SecretAreaTrigger(const Reader& reader) :
-  fade_tilemap("")
+  message_timer(),
+  message_displayed(),
+  message(),
+  fade_tilemap(),
+  script()
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
@@ -38,12 +42,21 @@ SecretAreaTrigger::SecretAreaTrigger(const Reader& reader) :
   reader.get("height", h);
   bbox.set_size(w, h);
   reader.get("fade-tilemap", fade_tilemap);
+  reader.get("message", message);
+  if(message == "") {
+    message = _("You found a secret area!");
+  }
+  reader.get("script", script);
 
   message_displayed = false;
 }
 
-SecretAreaTrigger::SecretAreaTrigger(const Rect& area, std::string fade_tilemap)
-  : fade_tilemap(fade_tilemap)
+SecretAreaTrigger::SecretAreaTrigger(const Rectf& area, std::string fade_tilemap_) :
+  message_timer(),
+  message_displayed(),
+  message(_("You found a secret area!")),
+  fade_tilemap(fade_tilemap_),
+  script()
 {
   bbox = area;
   message_displayed = false;
@@ -59,8 +72,8 @@ SecretAreaTrigger::draw(DrawingContext& context)
   if (message_timer.started()) {
     context.push_transform();
     context.set_translation(Vector(0, 0));
-    Vector pos = Vector(0, SCREEN_HEIGHT/2 - normal_font->get_height()/2);
-    context.draw_center_text(normal_font, _("You found a secret area!"), pos, LAYER_GUI, SecretAreaTrigger::text_color);
+    Vector pos = Vector(0, SCREEN_HEIGHT/2 - Resources::normal_font->get_height()/2);
+    context.draw_center_text(Resources::normal_font, message, pos, LAYER_HUD, SecretAreaTrigger::text_color);
     context.pop_transform();
   }
   if (message_timer.check()) {
@@ -88,10 +101,12 @@ SecretAreaTrigger::event(Player& , EventType type)
         }
       }
 
+      if(script != "") {
+        std::istringstream stream(script);
+        Sector::current()->run_script(stream, "SecretAreaScript");
+      }
     }
   }
 }
 
-IMPLEMENT_FACTORY(SecretAreaTrigger, "secretarea");
-
 /* EOF */