projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qmax patch to fix bug #0000389 - colors in infoblocks
[supertux.git]
/
src
/
badguy
/
dispenser.hpp
diff --git
a/src/badguy/dispenser.hpp
b/src/badguy/dispenser.hpp
index
fc1a424
..
1066078
100644
(file)
--- a/
src/badguy/dispenser.hpp
+++ b/
src/badguy/dispenser.hpp
@@
-29,16
+29,29
@@
public:
Dispenser(const lisp::Lisp& reader);
void activate();
Dispenser(const lisp::Lisp& reader);
void activate();
+ void deactivate();
void write(lisp::Writer& writer);
void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void active_update(float elapsed_time);
+ void freeze();
+ void unfreeze();
+ bool is_freezable() const;
+
+ virtual Dispenser* clone() const { return new Dispenser(*this); }
+
protected:
protected:
- bool collision_squished(Player& player);
+ bool collision_squished(GameObject& object);
+ HitResponse collision(GameObject& other, const CollisionHit& hit);
void launch_badguy();
float cycle;
void launch_badguy();
float cycle;
- std::string badguy;
+ std::vector<std::string> badguys;
+ unsigned int next_badguy;
Timer dispense_timer;
Timer dispense_timer;
+ bool autotarget;
+ bool swivel;
+ bool broken;
+ bool random;
+ std::string type;
};
#endif
};
#endif
-