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
/
block.cpp
diff --git
a/src/object/block.cpp
b/src/object/block.cpp
index
08f04fc
..
ae01648
100644
(file)
--- a/
src/object/block.cpp
+++ b/
src/object/block.cpp
@@
-81,7
+81,7
@@
Block::collision(GameObject& other, const CollisionHit& hitdata)
}
void
-Block::
action
(float elapsed_time)
+Block::
update
(float elapsed_time)
{
if(!bouncing)
return;