[iortcw] 387/497: All: Fix (unused) watertype checks in PM_WaterMove

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit b1de9b31c114001f0df51cbd67c9750251cb8bd3
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Fri Jul 31 17:21:35 2015 -0400

    All: Fix (unused) watertype checks in PM_WaterMove
---
 MP/code/game/bg_pmove.c | 4 ++--
 SP/code/game/bg_pmove.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MP/code/game/bg_pmove.c b/MP/code/game/bg_pmove.c
index 407e5bc..156d68a 100644
--- a/MP/code/game/bg_pmove.c
+++ b/MP/code/game/bg_pmove.c
@@ -648,9 +648,9 @@ static void PM_WaterMove( void ) {
 	// jump = head for surface
 	if ( pm->cmd.upmove >= 10 ) {
 		if ( pm->ps->velocity[2] > -300 ) {
-			if ( pm->watertype == CONTENTS_WATER ) {
+			if ( pm->watertype & CONTENTS_WATER ) {
 				pm->ps->velocity[2] = 100;
-			} else if ( pm->watertype == CONTENTS_SLIME ) {
+			} else if ( pm->watertype & CONTENTS_SLIME ) {
 				pm->ps->velocity[2] = 80;
 			} else {
 				pm->ps->velocity[2] = 50;
diff --git a/SP/code/game/bg_pmove.c b/SP/code/game/bg_pmove.c
index 1483722..28870e9 100644
--- a/SP/code/game/bg_pmove.c
+++ b/SP/code/game/bg_pmove.c
@@ -664,9 +664,9 @@ static void PM_WaterMove( void ) {
 	// jump = head for surface
 	if ( pm->cmd.upmove >= 10 ) {
 		if ( pm->ps->velocity[2] > -300 ) {
-			if ( pm->watertype == CONTENTS_WATER ) {
+			if ( pm->watertype & CONTENTS_WATER ) {
 				pm->ps->velocity[2] = 100;
-			} else if ( pm->watertype == CONTENTS_SLIME ) {
+			} else if ( pm->watertype & CONTENTS_SLIME ) {
 				pm->ps->velocity[2] = 80;
 			} else {
 				pm->ps->velocity[2] = 50;

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