okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(#5016) - Calls to trap_CM_PointContents don't update their origins based on moving entities (water). Patch by Ensiform

Browse source
This commit is contained in:
Thilo Schulz 2011-06-06 15:05:10 +00:00
parent 960dca2cd4
commit eec06674fa
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
code/cgame/cg_players.c
View file

@ -1543,7 +1543,7 @@ static void CG_BreathPuffs( centity_t *cent, refEntity_t *head) {
if ( cent->currentState.eFlags & EF_DEAD ) {
return;
}
contents = trap_CM_PointContents( head->origin, 0 );
contents = CG_PointContents( head->origin, 0 );
if ( contents & ( CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA ) ) {
return;
}
@ -2059,7 +2059,7 @@ static void CG_PlayerSplash( centity_t *cent ) {
// if the feet aren't in liquid, don't make a mark
// this won't handle moving water brushes, but they wouldn't draw right anyway...
contents = trap_CM_PointContents( end, 0 );
contents = CG_PointContents( end, 0 );
if ( !( contents & ( CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA ) ) ) {
return;
}
@ -2068,7 +2068,7 @@ static void CG_PlayerSplash( centity_t *cent ) {
start[2] += 32;
// if the head isn't out of liquid, don't make a mark
contents = trap_CM_PointContents( start, 0 );
contents = CG_PointContents( start, 0 );
if ( contents & ( CONTENTS_SOLID | CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA ) ) {
return;
}