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
/
mriceblock.hpp
diff --git
a/src/badguy/mriceblock.hpp
b/src/badguy/mriceblock.hpp
index
93aba4e
..
a00c5e7
100644
(file)
--- a/
src/badguy/mriceblock.hpp
+++ b/
src/badguy/mriceblock.hpp
@@
-47,7
+47,7
@@
public:
virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }
protected:
- bool collision_squished(
Player& player
);
+ bool collision_squished(
GameObject& object
);
private:
enum IceState {