aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-29 23:32:56 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-03-29 23:32:56 +0300
commit9d456ca87a96d9150c87e1de760e2668c128b459 (patch)
tree872aa0e6a50f82023741f6702a71899bccdb3c5b /src
parent18350ad37fbfb7027f2ab82ead5be58c1435cdf0 (diff)
downloadminetest-9d456ca87a96d9150c87e1de760e2668c128b459.tar.gz
minetest-9d456ca87a96d9150c87e1de760e2668c128b459.tar.bz2
minetest-9d456ca87a96d9150c87e1de760e2668c128b459.zip
Raise the player fall damage threshold to a much more fun level
Diffstat (limited to 'src')
-rw-r--r--src/environment.cpp6
1 files changed, 4 insertions, 2 deletions
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);
}
}
}