From c0ab09af747fc431dfb459ede30788cb9cd1c56b Mon Sep 17 00:00:00 2001 From: BlockMen Date: Fri, 11 Apr 2014 15:32:46 +0200 Subject: Add player:set_eye_offset() by @MirceaKitsune and clean up --- src/content_cao.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/content_cao.cpp') diff --git a/src/content_cao.cpp b/src/content_cao.cpp index dc3bae00d..dbaf13cc8 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -41,7 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/mathconstants.h" #include "map.h" #include "main.h" // g_settings -#include "game.h" // CameraModes +#include "camera.h" // CameraModes #include #include #include @@ -1099,8 +1099,14 @@ public: walking = true; m_animation_speed = player->local_animation_speed; + if(!player->touching_ground && + g_settings->getBool("free_move") && + m_gamedef->checkLocalPrivilege("fly") && + g_settings->getBool("fast_move") && + m_gamedef->checkLocalPrivilege("fast")) + m_animation_speed *= 1.5; if(controls.sneak && walking) - m_animation_speed = player->local_animation_speed/2; + m_animation_speed /= 2; player->last_animation_speed = m_animation_speed; -- cgit v1.2.3