projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big CMakeLists update.
[supertux.git]
/
src
/
trigger
/
secretarea_trigger.hpp
diff --git
a/src/trigger/secretarea_trigger.hpp
b/src/trigger/secretarea_trigger.hpp
index
02186a0
..
8500016
100644
(file)
--- a/
src/trigger/secretarea_trigger.hpp
+++ b/
src/trigger/secretarea_trigger.hpp
@@
-28,20
+28,20
@@
class SecretAreaTrigger : public TriggerBase, public Serializable
{
class SecretAreaTrigger : public TriggerBase, public Serializable
{
+ static Color text_color;
public:
SecretAreaTrigger(const lisp::Lisp& reader);
public:
SecretAreaTrigger(const lisp::Lisp& reader);
- SecretAreaTrigger(const Rect& area);
+ SecretAreaTrigger(const Rect& area
, std::string fade_tilemap = ""
);
~SecretAreaTrigger();
~SecretAreaTrigger();
-
+
void write(lisp::Writer& writer);
void event(Player& player, EventType type);
void draw(DrawingContext& context);
void write(lisp::Writer& writer);
void event(Player& player, EventType type);
void draw(DrawingContext& context);
-
+
private:
private:
- std::string message;
Timer message_timer;
bool message_displayed;
Timer message_timer;
bool message_displayed;
+ std::string fade_tilemap; /**< tilemap to fade away when trigger is activated, or empty if you don't care */
};
#endif
};
#endif
-