From 9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 12 Oct 2011 13:53:38 +0300 Subject: Header file tweaking; mainly for speed --- src/player.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/player.cpp') diff --git a/src/player.cpp b/src/player.cpp index 7cfdfebb6..86f0be7a1 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -22,7 +22,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "connection.h" #include "constants.h" #include "utility.h" - +#ifndef SERVER +#include +#endif +#include "settings.h" Player::Player(): touching_ground(false), @@ -344,7 +347,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d, is_frozen = false; // Skip collision detection if a special movement mode is used - bool free_move = g_settings.getBool("free_move"); + bool free_move = g_settings->getBool("free_move"); if(free_move) { setPosition(position); @@ -754,9 +757,9 @@ void LocalPlayer::applyControl(float dtime) v3f speed = v3f(0,0,0); - bool free_move = g_settings.getBool("free_move"); - bool fast_move = g_settings.getBool("fast_move"); - bool continuous_forward = g_settings.getBool("continuous_forward"); + bool free_move = g_settings->getBool("free_move"); + bool fast_move = g_settings->getBool("fast_move"); + bool continuous_forward = g_settings->getBool("continuous_forward"); if(free_move || is_climbing) { -- cgit v1.2.3