projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-optimized and cleaned up collision_object_map
[supertux.git]
/
src
/
player.cpp
diff --git
a/src/player.cpp
b/src/player.cpp
index
afc0c65
..
afc4eb5
100644
(file)
--- a/
src/player.cpp
+++ b/
src/player.cpp
@@
-456,6
+456,8
@@
Player::handle_input()
duck = false;
base.y -= 32;
base.height = 64;
duck = false;
base.y -= 32;
base.height = 64;
+ // changing base size confuses collision otherwise
+ old_base = previous_base = base;
}
}
}
}
@@
-468,13
+470,6
@@
Player::grow()
size = BIG;
base.height = 64;
base.y -= 32;
size = BIG;
base.height = 64;
base.y -= 32;
- // eventually go in duck mode if there's no space
- if(collision_object_map(base))
- {
- base.height = 32;
- base.y += 32;
- duck = true;
- }
old_base = previous_base = base;
}
old_base = previous_base = base;
}