projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
badguys can now have multiple hitpoints (default is 1)
[supertux.git]
/
src
/
trigger
/
secretarea_trigger.cpp
diff --git
a/src/trigger/secretarea_trigger.cpp
b/src/trigger/secretarea_trigger.cpp
index
53bbf8d
..
69c9d2a
100644
(file)
--- a/
src/trigger/secretarea_trigger.cpp
+++ b/
src/trigger/secretarea_trigger.cpp
@@
-12,16
+12,18
@@
SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader)
{
reader.get("x", bbox.p1.x);
reader.get("y", bbox.p1.y);
{
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;
}
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;
}
message = "You found a secret area!";
message_displayed = false;
}
@@
-69,3
+71,5
@@
SecretAreaTrigger::event(Player& , EventType type)
}
}
}
}
}
}
+
+//IMPLEMENT_FACTORY(SecretAreaTrigger, "secretarea_trigger")