projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
badguys now have normal hitpoints and bullet hitpoints, so you can make them need...
[supertux.git]
/
src
/
trigger
/
secretarea_trigger.h
diff --git
a/src/trigger/secretarea_trigger.h
b/src/trigger/secretarea_trigger.h
index
d2b6181
..
442b93d
100644
(file)
--- a/
src/trigger/secretarea_trigger.h
+++ b/
src/trigger/secretarea_trigger.h
@@
-6,22
+6,23
@@
#include "resources.h"
#include "video/drawing_context.h"
#include "app/globals.h"
#include "resources.h"
#include "video/drawing_context.h"
#include "app/globals.h"
+#include "timer.h"
class SecretAreaTrigger : public TriggerBase, public Serializable
{
public:
class SecretAreaTrigger : public TriggerBase, public Serializable
{
public:
- SecretAreaTrigger(
LispReader
& reader);
- SecretAreaTrigger(const
Vector& pos, const std::string& sequence
);
+ SecretAreaTrigger(
const lisp::Lisp
& reader);
+ SecretAreaTrigger(const
Rectangle& area
);
~SecretAreaTrigger();
~SecretAreaTrigger();
- void write(
Lisp
Writer& writer);
+ void write(
lisp::
Writer& writer);
void event(Player& player, EventType type);
void draw(DrawingContext& context);
private:
void event(Player& player, EventType type);
void draw(DrawingContext& context);
private:
- EventType triggerevent;
std::string message;
std::string message;
- int show_message;
+ Timer2 message_timer;
+ bool message_displayed;
};
#endif
};
#endif