projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
changed worldmap format a bit to be more consistent with level format
[supertux.git]
/
src
/
object
/
player.cpp
diff --git
a/src/object/player.cpp
b/src/object/player.cpp
index
f2bc78a
..
1a2d6c1
100644
(file)
--- a/
src/object/player.cpp
+++ b/
src/object/player.cpp
@@
-153,7
+153,7
@@
Player::set_controller(Controller* controller)
}
void
-Player::
action
(float elapsed_time)
+Player::
update
(float elapsed_time)
{
if(dying && dying_timer.check()) {
dead = true;