X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fsecretarea_trigger.cpp;h=5718ac990b2fc890c58b65ee0c06d9299b3161d8;hb=293018e8bf22831612509895e7e288e08ed734b5;hp=53bbf8d0e5cd952950418b58aedd18e9b65d3909;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp index 53bbf8d0e..5718ac990 100644 --- a/src/trigger/secretarea_trigger.cpp +++ b/src/trigger/secretarea_trigger.cpp @@ -4,6 +4,7 @@ #include "gameloop.h" #include "lisp/lisp.h" #include "lisp/writer.h" +#include "object_factory.h" #define MESSAGE_TIME 3.5 @@ -12,16 +13,18 @@ SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader) { reader.get("x", bbox.p1.x); reader.get("y", bbox.p1.y); - bbox.set_size(32, 32); + float w = 32, h = 32; + reader.get("width", w); + reader.get("height", h); + bbox.set_size(w, h); 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; } @@ -69,3 +72,5 @@ SecretAreaTrigger::event(Player& , EventType type) } } } + +IMPLEMENT_FACTORY(SecretAreaTrigger, "secretarea");