stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 15:22:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'RedEnchilada/master'

Browse source
This commit is contained in:
Alam Ed Arias 2014-04-17 17:46:02 -04:00
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

19
src/p_user.c
View file

@ -8392,11 +8392,26 @@ 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)) {
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; player->mo->flags2 |= MF2_SHADOW;
else else
player->mo->flags2 &= ~MF2_SHADOW; player->mo->flags2 &= ~MF2_SHADOW;
}
else
player->mo->flags2 &= ~MF2_SHADOW;
/* if (!resetcalled && (player->pflags & PF_NIGHTSMODE && player->exiting)) /* if (!resetcalled && (player->pflags & PF_NIGHTSMODE && player->exiting))
{ {