Fix (unused) watertype checks in PM_WaterMove

This commit is contained in:
Tobias Kuehnhammer 2015-07-26 19:55:17 +02:00 committed by Zack Middleton
parent 57a463dd5d
commit 49ab0cc05e

View file

@ -483,9 +483,9 @@ static void PM_WaterMove( void ) {
// jump = head for surface // jump = head for surface
if ( pm->cmd.upmove >= 10 ) { if ( pm->cmd.upmove >= 10 ) {
if (pm->ps->velocity[2] > -300) { if (pm->ps->velocity[2] > -300) {
if ( pm->watertype == CONTENTS_WATER ) { if ( pm->watertype & CONTENTS_WATER ) {
pm->ps->velocity[2] = 100; pm->ps->velocity[2] = 100;
} else if (pm->watertype == CONTENTS_SLIME) { } else if ( pm->watertype & CONTENTS_SLIME ) {
pm->ps->velocity[2] = 80; pm->ps->velocity[2] = 80;
} else { } else {
pm->ps->velocity[2] = 50; pm->ps->velocity[2] = 50;