Fix RVZ autocam AGAIN
This commit is contained in:
parent
a885380e8a
commit
1f88c70d6a
|
@ -1606,7 +1606,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
||||||
|
|
||||||
if (camadjustfactor)
|
if (camadjustfactor)
|
||||||
{
|
{
|
||||||
INT32 anglediff = ((player->pflags & PF_SPINNING) ? player->drawangle : (cmd->angleturn<<16)) + drawangleoffset - *myangle;
|
INT32 anglediff = ((player->pflags & PF_SPINNING) ? player->drawangle + drawangleoffset : (cmd->angleturn<<16)) - *myangle;
|
||||||
|
|
||||||
if (alt)
|
if (alt)
|
||||||
{
|
{
|
||||||
|
|
|
@ -10018,16 +10018,13 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
||||||
UINT8 forplayer = (thiscam == &camera) ? 0 : 1;
|
UINT8 forplayer = (thiscam == &camera) ? 0 : 1;
|
||||||
fixed_t shift = FixedMul(FINESINE((player->mo->angle - angle) >> ANGLETOFINESHIFT), cv_cam_shiftfacing[forplayer].value);
|
fixed_t shift = FixedMul(FINESINE((player->mo->angle - angle) >> ANGLETOFINESHIFT), cv_cam_shiftfacing[forplayer].value);
|
||||||
|
|
||||||
if (player->powers[pw_carry] == CR_ROLLOUT)
|
|
||||||
shift = -shift;
|
|
||||||
|
|
||||||
if (player->powers[pw_carry] == CR_NIGHTSMODE)
|
if (player->powers[pw_carry] == CR_NIGHTSMODE)
|
||||||
{
|
{
|
||||||
fixed_t cos = FINECOSINE((angle_t) (player->flyangle * ANG1)>>ANGLETOFINESHIFT);
|
fixed_t cos = FINECOSINE((angle_t) (player->flyangle * ANG1)>>ANGLETOFINESHIFT);
|
||||||
shift = FixedMul(shift, min(FRACUNIT, player->speed*abs(cos)/6000));
|
shift = FixedMul(shift, min(FRACUNIT, player->speed*abs(cos)/6000));
|
||||||
|
shift += FixedMul(camsideshift[forplayer] - shift, FRACUNIT-(camspeed>>2));
|
||||||
}
|
}
|
||||||
|
else if (ticcmd_centerviewdown[(thiscam == &camera) ? 0 : 1])
|
||||||
if (ticcmd_centerviewdown[(thiscam == &camera) ? 0 : 1])
|
|
||||||
shift = FixedMul(camsideshift[forplayer], FRACUNIT-camspeed);
|
shift = FixedMul(camsideshift[forplayer], FRACUNIT-camspeed);
|
||||||
else
|
else
|
||||||
shift += FixedMul(camsideshift[forplayer] - shift, FRACUNIT-(camspeed>>3));
|
shift += FixedMul(camsideshift[forplayer] - shift, FRACUNIT-(camspeed>>3));
|
||||||
|
|
Loading…
Reference in a new issue