From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 29 Mar 2012 20:32:56 +0000 (+0300)
Subject: Raise the player fall damage threshold to a much more fun level
X-Git-Tag: 0.4.dev-20120408~79
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d456ca87a96d9150c87e1de760e2668c128b459;p=oweals%2Fminetest.git

Raise the player fall damage threshold to a much more fun level
---

diff --git a/src/environment.cpp b/src/environment.cpp
index 5e8f5edba..0c6d829f5 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1999,13 +1999,15 @@ void ClientEnvironment::step(float dtime)
 		if(info.t == COLLISION_FALL)
 		{
 			//f32 tolerance = BS*10; // 2 without damage
-			f32 tolerance = BS*12; // 3 without damage
+			//f32 tolerance = BS*12; // 3 without damage
+			f32 tolerance = BS*14; // 5 without damage
 			f32 factor = 1;
 			if(info.speed > tolerance)
 			{
 				f32 damage_f = (info.speed - tolerance)/BS*factor;
 				u16 damage = (u16)(damage_f+0.5);
-				damageLocalPlayer(damage, true);
+				if(damage != 0)
+					damageLocalPlayer(damage, true);
 			}
 		}
 	}