summaryrefslogtreecommitdiff
path: root/src/player.cpp
diff options
context:
space:
mode:
authorMark Holmquist <marktraceur@gmail.com>2011-07-30 17:26:13 -0700
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-01 09:22:36 +0200
commit8e67f4c4e617a8fcbb9176de1bf0b267acfc6e2f (patch)
treec855923c5b2d76d6de7fbc5f46f29b1d60f6b1db /src/player.cpp
parent1c59cff8328bd85d6aed7df38b7eaddbeeca0aec (diff)
downloadminetest-8e67f4c4e617a8fcbb9176de1bf0b267acfc6e2f.tar.gz
minetest-8e67f4c4e617a8fcbb9176de1bf0b267acfc6e2f.tar.bz2
minetest-8e67f4c4e617a8fcbb9176de1bf0b267acfc6e2f.zip
Fixed a few problems in the ladder update, and changed the speed to account for gravity
Diffstat (limited to 'src/player.cpp')
-rw-r--r--src/player.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/player.cpp b/src/player.cpp
index 3846cd8f9..270f795b5 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -382,8 +382,8 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
try {
v3s16 pp = floatToInt(position + v3f(0,0.5*BS,0), BS);
v3s16 pp2 = floatToInt(position + v3f(0,-0.2*BS,0), BS);
- is_climbing = (content_features(map.getNode(pp).d).climbable ||
- content_features(map.getNode(pp2).d).climbable);
+ is_climbing = (content_features(map.getNode(pp).getContent()).climbable ||
+ content_features(map.getNode(pp2).getContent()).climbable);
}
catch(InvalidPositionException &e)
{
@@ -832,7 +832,7 @@ void LocalPlayer::applyControl(float dtime)
if (is_climbing) {
if (control.up || control.left || control.right || control.down) {
v3f speed = getSpeed();
- speed.Y = 2*BS;
+ speed.Y = 2.5*BS;
setSpeed(speed);
}
else {