diff options
| author | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
| commit | feb7de91ec34ef1ca3152270a7bc62b2e308f1bd (patch) | |
| tree | 65c33378bae9b7ac565b979237b6d594b511171f /src/camera.cpp | |
| parent | 33052abf42886ef03c4f46196cab6f767259a672 (diff) | |
| parent | 4468ea84e6d0faede5a01e8d97d359c537aa7ec8 (diff) | |
| download | minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.gz minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.bz2 minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/camera.cpp')
| -rw-r--r-- | src/camera.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/camera.cpp b/src/camera.cpp index b1e588415..138b022c0 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -218,6 +218,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize, // Smooth the movement when walking up stairs v3f old_player_position = m_playernode->getPosition(); v3f player_position = player->getPosition(); + if (player->isAttached && player->parent) + player_position = player->parent->getPosition(); //if(player->touching_ground && player_position.Y > old_player_position.Y) if(player->touching_ground && player_position.Y > old_player_position.Y) |