From 8809ab02fcbb3439edb32d626d22fa8581e1a174 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 14 Aug 2023 01:47:37 -0700 Subject: [PATCH] democam: remove unnecessary fields --- src/g_demo.c | 3 --- src/menus/transient/pause-replay.c | 2 -- src/p_local.h | 5 ----- src/p_user.c | 7 ------- 4 files changed, 17 deletions(-) diff --git a/src/g_demo.c b/src/g_demo.c index f0f7dca3f..ede754ee7 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -4129,9 +4129,6 @@ void G_StopDemo(void) demo.freecam = false; // reset democam shit too: democam.cam = NULL; - democam.localangle = 0; - democam.localaiming = 0; - democam.keyboardlook = false; Z_Free(demo.skinlist); demo.skinlist = NULL; diff --git a/src/menus/transient/pause-replay.c b/src/menus/transient/pause-replay.c index 2032eccc2..6db7cee98 100644 --- a/src/menus/transient/pause-replay.c +++ b/src/menus/transient/pause-replay.c @@ -246,8 +246,6 @@ void M_PlaybackToggleFreecam(INT32 choice) demo.freecam = false; // reset democam vars: democam.cam = NULL; - //democam.turnheld = false; - democam.keyboardlook = false; // reset only these. localangle / aiming gets set before the cam does anything anyway } } diff --git a/src/p_local.h b/src/p_local.h index c4a0d290a..08b3293ed 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -135,11 +135,6 @@ struct camera_t struct demofreecam_s { camera_t *cam; // this is useful when the game is paused, notably - - angle_t localangle; // keeps track of the cam angle for cmds - angle_t localaiming; // ditto with aiming - boolean turnheld; // holding turn button for gradual turn speed - boolean keyboardlook; // keyboard look }; extern struct demofreecam_s democam; diff --git a/src/p_user.c b/src/p_user.c index a29347aa0..a6a5076b1 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2989,20 +2989,13 @@ void P_DemoCameraMovement(camera_t *cam) // update democam stuff with what we got here: democam.cam = cam; - democam.localangle = cam->angle; - democam.localaiming = cam->aiming; - // first off we need to get button input cmd = D_LocalTiccmd(0); cam->aiming += cmd->aiming << TICCMD_REDUCE; cam->angle += cmd->turning << TICCMD_REDUCE; - democam.localangle += cmd->turning << TICCMD_REDUCE; - democam.localaiming += cmd->aiming << TICCMD_REDUCE; - cam->aiming = G_ClipAimingPitch((INT32 *)&cam->aiming); - democam.localaiming = G_ClipAimingPitch((INT32 *)&democam.localaiming); // camera movement: if (cmd->buttons & BT_ACCELERATE)