Reset cam pan if dead/reset/still

This commit is contained in:
TehRealSalt 2018-10-23 19:06:26 -04:00
parent 017d606828
commit 78ef057f81

View file

@ -8298,6 +8298,10 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
y = mo->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist); y = mo->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
// SRB2Kart: set camera panning // SRB2Kart: set camera panning
if (camstill || resetcalled || player->playerstate == PST_DEAD)
pan = 0;
else
{
if (player->kartstuff[k_drift] != 0) if (player->kartstuff[k_drift] != 0)
{ {
fixed_t panmax = (dist/5); fixed_t panmax = (dist/5);
@ -8317,6 +8321,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
x += xpan; x += xpan;
y += ypan; y += ypan;
}
pviewheight = FixedMul(32<<FRACBITS, mo->scale); pviewheight = FixedMul(32<<FRACBITS, mo->scale);