lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'RedEnchilada/master'

This commit is contained in:
Alam Ed Arias 2014-04-17 17:46:02 -04:00
parent d7101607a8 fa79c1856c
commit f4b9b11451
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/p_user.c
View File

@ -8392,9 +8392,24 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
} }
// Make player translucent if camera is too close (only in single player). // Make player translucent if camera is too close (only in single player).
if (!(multiplayer || netgame) && !splitscreen if (!(multiplayer || netgame) && !splitscreen)
&& P_AproxDistance(thiscam->x - player->mo->x, thiscam->y - player->mo->y) < FixedMul(48*FRACUNIT, mo->scale)) {
player->mo->flags2 |= MF2_SHADOW; fixed_t x = 0, y = 0;
if (player->awayviewtics) {
x = player->awayviewmobj->x;
y = player->awayviewmobj->y;
}
else
{
x = thiscam->x;
y = thiscam->y;
}
if (P_AproxDistance(x - player->mo->x, y - player->mo->y) < FixedMul(48*FRACUNIT, mo->scale))
player->mo->flags2 |= MF2_SHADOW;
else
player->mo->flags2 &= ~MF2_SHADOW;
}
else else
player->mo->flags2 &= ~MF2_SHADOW; player->mo->flags2 &= ~MF2_SHADOW;