From: PilzAdam <adam-k@outlook.com>
Date: Mon, 17 Dec 2012 17:04:41 +0000 (+0100)
Subject: Fix falling damage when not flying
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=f4ed37ec6f1d24c2da3dab14b3478d3b0452d7aa;p=zefram%2Fminetest%2Fminetest_engine.git

Fix falling damage when not flying
---

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 8189e46a..2a83ba95 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -303,7 +303,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
 	*/
 	bool bouncy_jump = false;
 	// Dont report if flying
-	if(collision_info && !g_settings->getBool("free_move"))
+	if(collision_info && !(g_settings->getBool("free_move") && fly_allowed))
 	{
 		for(size_t i=0; i<result.collisions.size(); i++){
 			const CollisionInfo &info = result.collisions[i];