From: ShadowNinja Date: Mon, 4 Feb 2013 03:22:42 +0000 (-0500) Subject: Don't fall off nodes if sneaking with free_move on but without fly privileges X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=1cda39d5bb1da90116ec9fb3da913634312b62fa;p=zefram%2Fminetest%2Fminetest_engine.git Don't fall off nodes if sneaking with free_move on but without fly privileges --- diff --git a/src/localplayer.cpp b/src/localplayer.cpp index b6dd0f42..2d0d7714 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -159,7 +159,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d, If sneaking, keep in range from the last walked node and don't fall off from it */ - if(control.sneak && m_sneak_node_exists && !g_settings->getBool("free_move")) + if(control.sneak && m_sneak_node_exists && !(fly_allowed && g_settings->getBool("free_move"))) { f32 maxd = 0.5*BS + sneak_max; v3f lwn_f = intToFloat(m_sneak_node, BS);