projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
SDL: Remove the alpha channel and approximate with a colorkey if the texture doesn...
[supertux.git]
/
src
/
badguy
/
dispenser.hpp
diff --git
a/src/badguy/dispenser.hpp
b/src/badguy/dispenser.hpp
index
5313b4f
..
e553d54
100644
(file)
--- a/
src/badguy/dispenser.hpp
+++ b/
src/badguy/dispenser.hpp
@@
-40,7
+40,7
@@
public:
virtual Dispenser* clone() const { return new Dispenser(*this); }
protected:
- bool collision_squished(
Player& player
);
+ bool collision_squished(
GameObject& object
);
void launch_badguy();
float cycle;
std::string badguy;