stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-17 18:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust how turn-to-angle tweens

Browse source
This commit is contained in:
fickleheart 2019-12-13 00:34:34 -06:00
parent bc4b1e1abe
commit 098c99a834
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/g_game.c
View file

@ -1548,18 +1548,33 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (abilitydirection && !forcestrafe && camera.chase && !turnheld[forplayer] && !ticcmd_centerviewdown[forplayer] && player->powers[pw_carry] != CR_MINECART) if (abilitydirection && !forcestrafe && camera.chase && !turnheld[forplayer] && !ticcmd_centerviewdown[forplayer] && player->powers[pw_carry] != CR_MINECART)
{ {
fixed_t camadjustfactor; fixed_t camadjustfactor;
boolean alt = false; // Reduce intensity on diagonals and prevent backwards movement from turning the camera
if (player->climbing || player->pflags & PF_GLIDING) if (player->climbing || player->pflags & PF_GLIDING)
camadjustfactor = cv_cam_turnfacingability[forplayer].value/4; camadjustfactor = cv_cam_turnfacingability[forplayer].value/4;
else if (player->pflags & PF_STARTDASH) else if (player->pflags & PF_STARTDASH)
camadjustfactor = cv_cam_turnfacingspindash[forplayer].value/4; camadjustfactor = cv_cam_turnfacingspindash[forplayer].value/4;
else else
{
alt = true;
camadjustfactor = cv_cam_turnfacing[forplayer].value/8; camadjustfactor = cv_cam_turnfacing[forplayer].value/8;
}
if (camadjustfactor) if (camadjustfactor)
{ {
INT32 anglediff = player->drawangle + drawangleoffset - *myangle; INT32 anglediff = player->drawangle + drawangleoffset - *myangle;
if (alt)
{
fixed_t sine = FINESINE((angle_t) (anglediff)>>ANGLETOFINESHIFT);
sine = abs(sine);
if (abs(anglediff) > ANGLE_90)
sine = max(0, sine*3 - 2*FRACUNIT); // At about 135 degrees, this will stop turning
anglediff = FixedMul(anglediff, sine);
}
*myangle += FixedMul(anglediff, camadjustfactor); *myangle += FixedMul(anglediff, camadjustfactor);
} }
} }