projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove draw_text from renderer.hpp and lightmap.hpp since text drawing is done in...
[supertux.git]
/
src
/
badguy
/
stumpy.hpp
diff --git
a/src/badguy/stumpy.hpp
b/src/badguy/stumpy.hpp
index
a3bd203
..
80117fe
100644
(file)
--- a/
src/badguy/stumpy.hpp
+++ b/
src/badguy/stumpy.hpp
@@
-1,4
+1,4
@@
-// $Id
: stumpy.hpp 3980 2006-07-10 19:55:56Z sommer
$
+// $Id$
//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
@@
-43,8
+43,8
@@
protected:
MyState mystate;
Timer invincible_timer;
MyState mystate;
Timer invincible_timer;
-
- bool collision_squished(
Player& player
);
+
+ bool collision_squished(
GameObject& object
);
};
#endif
};
#endif