.

[dragonfireclient.git] / src / environment.cpp

diff --git a/src/environment.cpp b/src/environment.cpp
index 906bab611d3c2af5846aa13ab9bc7439d2a8f5ea..17b98acd1a14a29ff3d1beebe63a459d4f432b14 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "environment.h"
-#include "main.h" // g_device for timing debug
 
 Environment::Environment(Map *map, std::ostream &dout):
                m_dout(dout)
@@ -107,7 +106,8 @@ void Environment::step(float dtime)
                        v3f playerpos = player->getPosition();
                        
                        // Apply physics to local player
-                       if(player->isLocal())
+                       bool haxmode = g_settings.getBool("haxmode");
+                       if(player->isLocal() && haxmode == false)
                        {
                                // Apply gravity to local player
                                v3f speed = player->getSpeed();