projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a809f73
)
Slippery: Do not apply when swimming (#8198)
author
SmallJoker
<SmallJoker@users.noreply.github.com>
Sun, 10 Feb 2019 16:04:04 +0000
(17:04 +0100)
committer
GitHub
<noreply@github.com>
Sun, 10 Feb 2019 16:04:04 +0000
(17:04 +0100)
src/client/localplayer.cpp
patch
|
blob
|
history
diff --git
a/src/client/localplayer.cpp
b/src/client/localplayer.cpp
index c627cc6d9a0053d6d04c696829e74db6ae25e75f..7e7b1a867bf3722800782610563f01e078730e6a 100644
(file)
--- a/
src/client/localplayer.cpp
+++ b/
src/client/localplayer.cpp
@@
-689,7
+689,7
@@
void LocalPlayer::applyControl(float dtime, Environment *env)
incH = incV = movement_acceleration_default * BS * dtime;
float slip_factor = 1.0f;
- if (!free_move)
+ if (!free_move
&& !in_liquid && !in_liquid_stable
)
slip_factor = getSlipFactor(env, speedH);
// Don't sink when swimming in pitch mode