From 146a507a478cd11fc56ab390bdaae34adcda547b Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 9 Aug 2025 16:29:49 +0200 Subject: [PATCH] remove I_BaseTiccmd just complicates things, can just memset our ticcmnds instead psure this was used ages ago for smth but its not needed here at all --- src/android/i_system.c | 12 +----------- src/dedicated/i_system.c | 37 ------------------------------------- src/g_game.c | 17 +---------------- src/i_system.h | 21 --------------------- src/p_user.c | 17 ----------------- src/sdl/i_system.cpp | 36 ------------------------------------ 6 files changed, 2 insertions(+), 138 deletions(-) diff --git a/src/android/i_system.c b/src/android/i_system.c index 7f034c752..b20625587 100644 --- a/src/android/i_system.c +++ b/src/android/i_system.c @@ -89,7 +89,7 @@ precise_t I_GetPreciseTime(void) return 0; } -UINT64 I_GetPrecisePrecision(void) +UINT64 I_GetPrecisePrecision(void) { return 1000000; } @@ -98,16 +98,6 @@ void I_GetEvent(void){} void I_OsPolling(void){} -ticcmd_t *I_BaseTiccmd(void) -{ - return NULL; -} - -ticcmd_t *I_BaseTiccmd2(void) -{ - return NULL; -} - void I_Quit(void) { LOGD("SRB2Kart quitting!"); diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index 6ab748f86..f726b4aa9 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -1223,43 +1223,6 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) #undef WINMUMBLE #endif // NOMUMBLE - -/** \brief empty ticcmd for player 1 -*/ -static ticcmd_t emptycmd; - -ticcmd_t *I_BaseTiccmd(void) -{ - return &emptycmd; -} - -/** \brief empty ticcmd for player 2 -*/ -static ticcmd_t emptycmd2; - -ticcmd_t *I_BaseTiccmd2(void) -{ - return &emptycmd2; -} - -/** \brief empty ticcmd for player 3 - */ -static ticcmd_t emptycmd3; - -ticcmd_t *I_BaseTiccmd3(void) -{ - return &emptycmd3; -} - -/** \brief empty ticcmd for player 4 - */ -static ticcmd_t emptycmd4; - -ticcmd_t *I_BaseTiccmd4(void) -{ - return &emptycmd4; -} - // // I_GetTime // returns time in 1/TICRATE second tics diff --git a/src/g_game.c b/src/g_game.c index bc41e4510..ac1ecd965 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -897,22 +897,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) th = turnheld[forplayer]; rd = resetdown[forplayer]; - switch (ssplayer) - { - case 2: - G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); - break; - case 3: - G_CopyTiccmd(cmd, I_BaseTiccmd3(), 1); - break; - case 4: - G_CopyTiccmd(cmd, I_BaseTiccmd4(), 1); - break; - case 1: - default: - G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver - break; - } + memset(cmd, 0, sizeof(ticcmd_t)); // why build a ticcmd if we're paused? // Or, for that matter, if we're being reborn. diff --git a/src/i_system.h b/src/i_system.h index b26db7a82..bef997acf 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -91,27 +91,6 @@ void I_GetEvent(void); */ void I_OsPolling(void); -// Either returns a null ticcmd, -// or calls a loadable driver to build it. -// This ticcmd will then be modified by the gameloop -// for normal input. - -/** \brief Input for the first player -*/ -ticcmd_t *I_BaseTiccmd(void); - -/** \brief Input for the second player -*/ -ticcmd_t *I_BaseTiccmd2(void); - -/** \brief Input for the third player -*/ -ticcmd_t *I_BaseTiccmd3(void); - -/** \brief Input for the fourth player -*/ -ticcmd_t *I_BaseTiccmd4(void); - /** \brief Called by M_Responder when quit is selected, return exit code 0 */ void I_Quit(void) FUNCNORETURN; diff --git a/src/p_user.c b/src/p_user.c index b8a80def1..2ff88a8bc 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3133,23 +3133,6 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) lang = cam->localangle; laim = cam->localaiming; - switch (forplayer) - { - case 2: - G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); - break; - case 3: - G_CopyTiccmd(cmd, I_BaseTiccmd3(), 1); - break; - case 4: - G_CopyTiccmd(cmd, I_BaseTiccmd4(), 1); - break; - case 1: - default: - G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver - break; - } - cmd->angleturn = (INT16)(lang >> 16); cmd->aiming = G_ClipAimingPitch(&laim); diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 8549c3af5..fa13a2ef9 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1710,42 +1710,6 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) #undef WINMUMBLE #endif // NOMUMBLE -/** \brief empty ticcmd for player 1 -*/ -static ticcmd_t emptycmd; - -ticcmd_t *I_BaseTiccmd(void) -{ - return &emptycmd; -} - -/** \brief empty ticcmd for player 2 -*/ -static ticcmd_t emptycmd2; - -ticcmd_t *I_BaseTiccmd2(void) -{ - return &emptycmd2; -} - -/** \brief empty ticcmd for player 3 -*/ -static ticcmd_t emptycmd3; - -ticcmd_t *I_BaseTiccmd3(void) -{ - return &emptycmd3; -} - -/** \brief empty ticcmd for player 4 -*/ -static ticcmd_t emptycmd4; - -ticcmd_t *I_BaseTiccmd4(void) -{ - return &emptycmd4; -} - // // I_GetTime // returns time in 1/TICRATE second tics