[iortcw] 388/497: All: Fix additional watertype operators

[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 587dacb3f5a7a98dca83a6751b6fcec4cd5753d2
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Fri Jul 31 17:39:01 2015 -0400

    All: Fix additional watertype operators
---
 MP/code/game/bg_pmove.c | 6 +++---
 SP/code/game/bg_pmove.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MP/code/game/bg_pmove.c b/MP/code/game/bg_pmove.c
index 156d68a..8eb5221 100644
--- a/MP/code/game/bg_pmove.c
+++ b/MP/code/game/bg_pmove.c
@@ -260,7 +260,7 @@ static void PM_Friction( void ) {
 
 	// apply water friction even if just wading
 	if ( pm->waterlevel ) {
-		if ( pm->watertype == CONTENTS_SLIME ) { //----(SA)	slag
+		if ( pm->watertype & CONTENTS_SLIME ) { //----(SA)	slag
 			drop += speed * pm_slagfriction * pm->waterlevel * pml.frametime;
 		} else {
 			drop += speed * pm_waterfriction * pm->waterlevel * pml.frametime;
@@ -679,7 +679,7 @@ static void PM_WaterMove( void ) {
 	VectorCopy( wishvel, wishdir );
 	wishspeed = VectorNormalize( wishdir );
 
-	if ( pm->watertype == CONTENTS_SLIME ) {    //----(SA)	slag
+	if ( pm->watertype & CONTENTS_SLIME ) {    //----(SA)	slag
 		if ( wishspeed > pm->ps->speed * pm_slagSwimScale ) {
 			wishspeed = pm->ps->speed * pm_slagSwimScale;
 		}
@@ -933,7 +933,7 @@ static void PM_WalkMove( void ) {
 		float waterScale;
 
 		waterScale = pm->waterlevel / 3.0;
-		if ( pm->watertype == CONTENTS_SLIME ) { //----(SA)	slag
+		if ( pm->watertype & CONTENTS_SLIME ) { //----(SA)	slag
 			waterScale = 1.0 - ( 1.0 - pm_slagSwimScale ) * waterScale;
 		} else {
 			waterScale = 1.0 - ( 1.0 - pm_waterSwimScale ) * waterScale;
diff --git a/SP/code/game/bg_pmove.c b/SP/code/game/bg_pmove.c
index 28870e9..6d41a8e 100644
--- a/SP/code/game/bg_pmove.c
+++ b/SP/code/game/bg_pmove.c
@@ -279,7 +279,7 @@ static void PM_Friction( void ) {
 
 	// apply water friction even if just wading
 	if ( pm->waterlevel ) {
-		if ( pm->watertype == CONTENTS_SLIME ) { //----(SA)	slag
+		if ( pm->watertype & CONTENTS_SLIME ) { //----(SA)	slag
 			drop += speed * pm_slagfriction * pm->waterlevel * pml.frametime;
 		} else {
 			drop += speed * pm_waterfriction * pm->waterlevel * pml.frametime;
@@ -694,7 +694,7 @@ static void PM_WaterMove( void ) {
 	VectorCopy( wishvel, wishdir );
 	wishspeed = VectorNormalize( wishdir );
 
-	if ( pm->watertype == CONTENTS_SLIME ) {    //----(SA)	slag
+	if ( pm->watertype & CONTENTS_SLIME ) {    //----(SA)	slag
 		if ( wishspeed > pm->ps->speed * pm_slagSwimScale ) {
 			wishspeed = pm->ps->speed * pm_slagSwimScale;
 		}
@@ -1013,7 +1013,7 @@ static void PM_WalkMove( void ) {
 		float waterScale;
 
 		waterScale = pm->waterlevel / 3.0;
-		if ( pm->watertype == CONTENTS_SLIME ) { //----(SA)	slag
+		if ( pm->watertype & CONTENTS_SLIME ) { //----(SA)	slag
 			waterScale = 1.0 - ( 1.0 - pm_slagSwimScale ) * waterScale;
 		} else {
 			waterScale = 1.0 - ( 1.0 - pm_waterSwimScale ) * waterScale;

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