BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

LocalPlayer::accelerateHorizontal: cleanups

Browse Source 
* Properly use v3f default constructor
* v3f d_wanted = target_speed - m_speed; and d_wanted = target_speed * 0.1f - m_speed * 0.1f; can be factorized to d_wanted = (target_speed - m_speed) * 0.1f; => d_wanted *= 0.1f;
This commit is contained in:
Loic Blot 2017-08-13 23:08:17 +02:00
parent d65d6160d8
commit 725a0f56db
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/localplayer.cpp
View File

@ -713,36 +713,36 @@ void LocalPlayer::accelerateHorizontal(const v3f &target_speed,
v3f d_wanted = target_speed - m_speed; v3f d_wanted = target_speed - m_speed;
if (slippery) { if (slippery) {
if (target_speed == v3f(0)) if (target_speed == v3f())
d_wanted = -m_speed * 0.05f; d_wanted = -m_speed * 0.05f;
else else
d_wanted = target_speed * 0.1f - m_speed * 0.1f; d_wanted *= 0.1f;
} }
d_wanted.Y = 0; d_wanted.Y = 0.0f;
f32 dl = d_wanted.getLength(); f32 dl = d_wanted.getLength();
if (dl > max_increase) if (dl > max_increase)
dl = max_increase; dl = max_increase;
v3f d = d_wanted.normalize() * dl; v3f d = d_wanted.normalize() * dl;
m_speed.X += d.X; m_speed.X += d.X;
m_speed.Z += d.Z; m_speed.Z += d.Z;
} }
// Vertical acceleration (Y), X and Z directions are ignored // Vertical acceleration (Y), X and Z directions are ignored
void LocalPlayer::accelerateVertical(const v3f &target_speed, const f32 max_increase) void LocalPlayer::accelerateVertical(const v3f &target_speed, const f32 max_increase)
{ {
if (max_increase == 0) if (max_increase == 0)
return; return;
f32 d_wanted = target_speed.Y - m_speed.Y; f32 d_wanted = target_speed.Y - m_speed.Y;
if (d_wanted > max_increase) if (d_wanted > max_increase)
d_wanted = max_increase; d_wanted = max_increase;
else if (d_wanted < -max_increase) else if (d_wanted < -max_increase)
d_wanted = -max_increase; d_wanted = -max_increase;
m_speed.Y += d_wanted; m_speed.Y += d_wanted;
} }
// Temporary option for old move code // Temporary option for old move code