From 4b68b41a3181bf78097c95453ef72ec2fbebc069 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 7 Apr 2020 17:06:20 -0700 Subject: [PATCH] Fix lol xd compiler errors --- src/d_clisrv.c | 2 +- src/p_user.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 44b08cca..b6cfc3ee 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5202,7 +5202,7 @@ static void Local_Maketic(INT32 realtics) void SV_SpawnPlayer(INT32 playernum, INT32 x, INT32 y, angle_t angle) { tic_t tic; - UINT8 numadjust = 0; + UINT16 numadjust = 0; (void)x; (void)y; diff --git a/src/p_user.c b/src/p_user.c index 641652a1..e0fb6fb4 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -7231,9 +7231,13 @@ static ticcmd_t *P_CameraCmd(camera_t *cam) boolean turnleft, turnright, mouseaiming; boolean invertmouse, lookaxis, usejoystick, kbl; angle_t lang; + INT32 player_invert; + INT32 screen_invert; ticcmd_t *cmd = &cameracmd; + (void)cam; + if (!demo.playback) return cmd; // empty cmd, no. @@ -7312,8 +7316,8 @@ static ticcmd_t *P_CameraCmd(camera_t *cam) // spectator aiming shit, ahhhh... - INT32 player_invert = invertmouse ? -1 : 1; - INT32 screen_invert = 1; // nope + player_invert = invertmouse ? -1 : 1; + screen_invert = 1; // nope // mouse look stuff (mouse look is not the same as mouse aim) kbl = false; @@ -7425,13 +7429,12 @@ void P_DemoCameraMovement(camera_t *cam) void P_ResetCamera(player_t *player, camera_t *thiscam) { + tic_t tries = 0; + fixed_t x, y, z; if (demo.freecam) return; // do not reset the camera there. - tic_t tries = 0; - fixed_t x, y, z; - if (!player->mo) return;