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

Suspend turn-to-angle when rotating the camera

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

11
src/g_game.c
View file

@ -1058,6 +1058,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
static boolean resetdown[2]; // don't cam reset every frame
static boolean joyaiming[2]; // check the last frame's value if we need to reset the camera
static boolean zchange[2]; // only switch z targets once per press
static fixed_t tta_factor[2] = {FRACUNIT, FRACUNIT}; // disables turn-to-angle when manually turning camera until movement happens
UINT8 forplayer = ssplayer-1;
if (ssplayer == 1)
@ -1204,6 +1205,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
cmd->angleturn = (INT16)(cmd->angleturn - ((axis * angleturn[1]) >> 10)); // ANALOG!
}
if (turnright || turnleft || abs(cmd->angleturn) > angleturn[1])
tta_factor[forplayer] = 0; // suspend turn to angle
// Make rotspeed affect turning speed :)
cmd->angleturn = (cmd->angleturn * (ssplayer == 1 ? cv_cam_rotspeed.value : cv_cam2_rotspeed.value)) / 10;
}
@ -1557,9 +1561,14 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
else
{
alt = true;
camadjustfactor = cv_cam_turnfacing[forplayer].value/8;
camadjustfactor = FixedMul(cv_cam_turnfacing[forplayer].value/8, tta_factor[forplayer]);
}
if (tta_factor[forplayer] < FRACUNIT && (!alt || cmd->forwardmove || cmd->sidemove || tta_factor[forplayer] >= FRACUNIT/3))
tta_factor[forplayer] += FRACUNIT>>5;
else if (tta_factor[forplayer] && tta_factor[forplayer] < FRACUNIT/3)
tta_factor[forplayer] -= FRACUNIT>>5;
if (camadjustfactor)
{
INT32 anglediff = player->drawangle + drawangleoffset - *myangle;