[iortcw] 79/89: All: Fix friction in AAS_PredictClientMovement

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 33d62b42a153414f39895cfec77b086948d4ee17
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Thu Aug 3 00:11:22 2017 -0400

    All: Fix friction in AAS_PredictClientMovement
---
 MP/code/botlib/be_aas_move.c | 2 +-
 SP/code/botlib/be_aas_move.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/botlib/be_aas_move.c b/MP/code/botlib/be_aas_move.c
index 7e23be3..6556d65 100644
--- a/MP/code/botlib/be_aas_move.c
+++ b/MP/code/botlib/be_aas_move.c
@@ -480,7 +480,7 @@ int AAS_PredictClientMovement( struct aas_clientmove_s *move,
 		frame_test_vel[2] = frame_test_vel[2] - ( gravity * 0.1 * frametime );
 		//if on the ground or swimming
 		if ( onground || swimming ) {
-			friction = swimming ? sv_friction : sv_waterfriction;
+			friction = swimming ? sv_waterfriction : sv_friction;
 			//apply friction
 			VectorScale( frame_test_vel, 1 / frametime, frame_test_vel );
 			AAS_ApplyFriction( frame_test_vel, friction, sv_stopspeed, frametime );
diff --git a/SP/code/botlib/be_aas_move.c b/SP/code/botlib/be_aas_move.c
index e9c5cf8..14a2e55 100644
--- a/SP/code/botlib/be_aas_move.c
+++ b/SP/code/botlib/be_aas_move.c
@@ -480,7 +480,7 @@ int AAS_PredictClientMovement( struct aas_clientmove_s *move,
 		frame_test_vel[2] = frame_test_vel[2] - ( gravity * 0.1 * frametime );
 		//if on the ground or swimming
 		if ( onground || swimming ) {
-			friction = swimming ? sv_friction : sv_waterfriction;
+			friction = swimming ? sv_waterfriction : sv_friction;
 			//apply friction
 			VectorScale( frame_test_vel, 1 / frametime, frame_test_vel );
 			AAS_ApplyFriction( frame_test_vel, friction, sv_stopspeed, frametime );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git