summaryrefslogtreecommitdiff
path: root/src/environment.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-01-17 14:57:37 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-01-17 14:57:37 +0200
commit0fa0e0752a28eeb43195f2288c018d5c0b24520b (patch)
tree72c05dc4cd98663d92a6a312c6b8128c18791590 /src/environment.cpp
parentbd26be262d30eeb0ca818b634891704de4365893 (diff)
downloadminetest-0fa0e0752a28eeb43195f2288c018d5c0b24520b.tar.gz
minetest-0fa0e0752a28eeb43195f2288c018d5c0b24520b.tar.bz2
minetest-0fa0e0752a28eeb43195f2288c018d5c0b24520b.zip
old water removed, some fixes here and there
Diffstat (limited to 'src/environment.cpp')
-rw-r--r--src/environment.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index 420681355..17b98acd1 100644
--- 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() && HAXMODE == false)
+ bool haxmode = g_settings.getBool("haxmode");
+ if(player->isLocal() && haxmode == false)
{
// Apply gravity to local player
v3f speed = player->getSpeed();