stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation errors

Browse source
This commit is contained in:
fickleheart 2019-12-30 11:01:56 -06:00
parent a9b80bf1f0
commit f4e7227e11
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/g_game.c
View file

@ -459,6 +459,9 @@ typedef enum
AXISMOVE, AXISMOVE,
AXISLOOK, AXISLOOK,
AXISSTRAFE, AXISSTRAFE,
AXISDIGITAL, // axes below this use digital deadzone
AXISJUMP, AXISJUMP,
AXISSPIN, AXISSPIN,
AXISFIRE, AXISFIRE,
@ -1222,7 +1225,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
*myaiming = 0; *myaiming = 0;
joyaiming[forplayer] = thisjoyaiming; joyaiming[forplayer] = thisjoyaiming;
turnaxis = JPlayerJoyAxis(ssplayer, AXISTURN); turnaxis = PlayerJoyAxis(ssplayer, AXISTURN);
if (strafeisturn) if (strafeisturn)
turnaxis += PlayerJoyAxis(ssplayer, AXISSTRAFE); turnaxis += PlayerJoyAxis(ssplayer, AXISSTRAFE);
lookaxis = PlayerJoyAxis(ssplayer, AXISLOOK); lookaxis = PlayerJoyAxis(ssplayer, AXISLOOK);
@ -1301,9 +1304,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (turnright || turnleft || abs(cmd->angleturn) > angleturn[2]) if (turnright || turnleft || abs(cmd->angleturn) > angleturn[2])
tta_factor[forplayer] = 0; // suspend turn to angle 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;
} }
strafeaxis = strafeisturn ? 0 : PlayerJoyAxis(ssplayer, AXISSTRAFE); strafeaxis = strafeisturn ? 0 : PlayerJoyAxis(ssplayer, AXISSTRAFE);