From 357dcb95430771dcbbbc358889e54c8d78f3749b Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 2 Dec 2025 12:38:11 +0100 Subject: [PATCH] ticcmd: replace magic numbers with constants names lifted from RR --- src/b_bot.c | 22 +++++++++++----------- src/d_clisrv.c | 9 ++++++--- src/d_ticcmd.h | 11 ++++++++--- src/g_game.c | 16 ++++++++-------- src/m_cheat.c | 2 +- src/p_user.c | 44 ++++++++++++++++++++++---------------------- 6 files changed, 56 insertions(+), 48 deletions(-) diff --git a/src/b_bot.c b/src/b_bot.c index 8100fc414..fa1508917 100644 --- a/src/b_bot.c +++ b/src/b_bot.c @@ -47,7 +47,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm if (sonic->player->pflags & (PF_MACESPIN|PF_ITEMHANG)) { cmd->forwardmove = sonic->player->cmd.forwardmove; - cmd->angleturn = abs((signed)(tails->angle - sonic->angle))>>16; + cmd->angleturn = abs((signed)(tails->angle - sonic->angle)) >> TICCMD_REDUCE; if (sonic->angle < tails->angle) cmd->angleturn = -cmd->angleturn; } else if (dist > FixedMul(512*FRACUNIT, tails->scale)) @@ -139,13 +139,13 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward // Don't mess with bot inputs during these unhandled movement conditions. // The normal AI doesn't use abilities, so custom AI should be sending us exactly what it wants anyway. if (forward) - cmd->forwardmove += MAXPLMOVE<>16; + cmd->forwardmove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; if (backward) - cmd->forwardmove -= MAXPLMOVE<>16; + cmd->forwardmove -= MAXPLMOVE<> TICCMD_REDUCE; if (left || strafeleft) - cmd->sidemove -= MAXPLMOVE<>16; + cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; if (right || straferight) - cmd->sidemove += MAXPLMOVE<>16; + cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; } else { // In standard 2D mode, interpret "forward" as "the way you're facing" and everything else as "the way you're not facing" if (left || right) @@ -163,23 +163,23 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward right = true; } if (left || strafeleft) - cmd->sidemove -= MAXPLMOVE<>16; + cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; if (right || straferight) - cmd->sidemove += MAXPLMOVE<>16; + cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; } } else { if (forward) - cmd->forwardmove += MAXPLMOVE<>16; + cmd->forwardmove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; if (backward) - cmd->forwardmove -= MAXPLMOVE<>16; + cmd->forwardmove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; if (left) cmd->angleturn += 1280; if (right) cmd->angleturn -= 1280; if (strafeleft) - cmd->sidemove -= MAXPLMOVE<>16; + cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; if (straferight) - cmd->sidemove += MAXPLMOVE<>16; + cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE; } if (jump) cmd->buttons |= BT_DRIFT; diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 2c48e2de9..1a72ecc96 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2072,6 +2072,7 @@ static void CL_LoadReceivedSavegame(boolean reloading) length = FIL_ReadFile(tmpsave, &save.buffer); CONS_Printf(M_GetText("Loading savegame length %s\n"), sizeu1(length)); + if (!length) { I_Error("Can't read savegame sent"); @@ -2155,7 +2156,7 @@ static void CL_ReloadReceivedSavegame(void) // we dont have P_ForceLocalAngle so were setting it manually here for (i = 0; i <= splitscreen; i++) { - P_ForceLocalAngle(&players[displayplayers[i]], (angle_t)(players[displayplayers[i]].cmd.angleturn << 16)); + P_ForceLocalAngle(&players[displayplayers[i]], (angle_t)(players[displayplayers[i]].cmd.angleturn << TICCMD_REDUCE)); } for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) @@ -4519,7 +4520,7 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum) DEBFILE("spawning me\n"); } - P_ForceLocalAngle(&players[newplayernum], (angle_t)(players[newplayernum].cmd.angleturn << 16)); + P_ForceLocalAngle(&players[newplayernum], (angle_t)(players[newplayernum].cmd.angleturn << TICCMD_REDUCE)); D_SendPlayerConfig(); addedtogame = true; @@ -6466,6 +6467,7 @@ static void SV_SendTics(void) continue; DEBFILE(va("Sent %d anyway\n", realfirsttic)); } + realfirsttic = max(realfirsttic, firstticstosend); // compute the length of the packet and cut it if too large @@ -6611,7 +6613,8 @@ void SV_SpawnPlayer(INT32 playernum, INT32 x, INT32 y, angle_t angle) // -- Monster Iestyn 16/01/18 break; } - netcmds[tic%BACKUPTICS][playernum].angleturn = (INT16)((angle>>16) | TICCMD_RECEIVED); + + netcmds[tic%BACKUPTICS][playernum].angleturn = (INT16)((angle >> TICCMD_REDUCE) | TICCMD_RECEIVED); if (!tic) // failsafe for gametic == 0 -- Monster Iestyn 16/01/18 break; diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h index 98e4891e3..df26aa882 100644 --- a/src/d_ticcmd.h +++ b/src/d_ticcmd.h @@ -46,15 +46,20 @@ typedef enum // Mainly movements/button commands per game tick, // plus a checksum for internal state consistency. +// ticcmd turning bits +#define TICCMD_REDUCE 16 + +// ticcmd latency mask +#define TICCMD_LATENCYMASK 0xFF + // bits in angleturn -#define TICCMD_RECEIVED 1 -#define TICCMD_XY 2 +#define TICCMD_RECEIVED (0x01) /* Actual tic recieved from client */ typedef struct { SINT8 forwardmove; // -MAXPLMOVE to MAXPLMOVE (50) SINT8 sidemove; // -MAXPLMOVE to MAXPLMOVE (50) - INT16 angleturn; // <<16 for angle delta - saved as 1 byte into demos + INT16 angleturn; // << TICCMD_REDUCE for angle delta - saved as 1 byte into demos INT16 aiming; // vertical aiming, see G_BuildTicCmd UINT16 buttons; INT16 driftturn; // SRB2Kart: Used for getting drift turn speed diff --git a/src/g_game.c b/src/g_game.c index 0f91c5312..1d619a490 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -663,7 +663,7 @@ INT16 G_ClipAimingPitch(INT32 *aiming) else if (*aiming < -limitangle) *aiming = -limitangle; - return (INT16)((*aiming)>>16); + return (INT16)((*aiming) >> TICCMD_REDUCE); } INT16 G_SoftwareClipAimingPitch(INT32 *aiming) @@ -676,7 +676,7 @@ INT16 G_SoftwareClipAimingPitch(INT32 *aiming) else if (*aiming < -limitangle) *aiming = -limitangle; - return (INT16)((*aiming)>>16); + return (INT16)((*aiming) >> TICCMD_REDUCE); } INT32 JoyAxis(axis_input_e axissel, UINT8 player) @@ -960,7 +960,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // Kart, don't build a ticcmd if someone is resynching or the server is stopped too so we don't fly off course in bad conditions if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching) { - cmd->angleturn = (INT16)(lang >> 16); + cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE); cmd->aiming = G_ClipAimingPitch(&laim); return; } @@ -968,7 +968,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // dumbass thing so we can use a few buttons but dont accidentally drive away if (player->spectator || freecam) { - cmd->angleturn = (INT16)(lang >> 16); + cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE); G_BuildLocalTiccmd(cmd, ssplayer, freecam); // let lua override everything @@ -1167,10 +1167,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) || (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn || (player->kartstuff[k_respawn]) // Respawning || (player->spectator || objectplacing))) // Not a physical player - lang += (cmd->angleturn<<16); + lang += (cmd->angleturn << TICCMD_REDUCE); - cmd->angleturn = (INT16)(lang >> 16); - cmd->latency = modeattacking ? 0 : (leveltime & 0xFF); // Send leveltime when this tic was generated to the server for control lag calculations + cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE); + cmd->latency = modeattacking ? 0 : (leveltime & TICCMD_LATENCYMASK); // Send leveltime when this tic was generated to the server for control lag calculations if (!hu_stopped) { @@ -1878,7 +1878,7 @@ void G_Ticker(boolean run) G_CopyTiccmd(cmd, &netcmds[buf][i], 1); // Use the leveltime sent in the player's ticcmd to determine control lag - cmd->latency = modeattacking ? 0 : min(((leveltime & 0xFF) - cmd->latency) & 0xFF, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max + cmd->latency = modeattacking ? 0 : min(((leveltime & TICCMD_LATENCYMASK) - cmd->latency) & TICCMD_LATENCYMASK, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max } } diff --git a/src/m_cheat.c b/src/m_cheat.c index 85caaa234..2890c7196 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -908,7 +908,7 @@ void OP_ObjectplaceMovement(player_t *player) ticcmd_t *cmd = &player->cmd; if (!player->climbing && (netgame || (player->pflags & PF_SPINNING))) - player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */); + player->mo->angle = (cmd->angleturn << TICCMD_REDUCE); ticruned++; if (!(cmd->angleturn & TICCMD_RECEIVED)) diff --git a/src/p_user.c b/src/p_user.c index e026e5012..448a2ff8c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -974,17 +974,6 @@ fixed_t P_GetPlayerSpinHeight(player_t *player) return FixedMul(FixedMul(player->mo->info->height, player->mo->scale),2*FRACUNIT/3); } -// -// P_GetLocalPlayerForNum -// -// Returns the player -// on the local machine for given number. -// -player_t *P_GetLocalPlayerForNum(UINT8 pnum) -{ - return (&players[P_GetLocalPlayerNumForNum(pnum)]); -} - // // P_GetLocalPlayerNumForNum // @@ -996,6 +985,17 @@ INT32 P_GetLocalPlayerNumForNum(UINT8 pnum) return (pnum == 0 ? consoleplayer : displayplayers[pnum]); } +// +// P_GetLocalPlayerForNum +// +// Returns the player +// on the local machine for given number. +// +player_t *P_GetLocalPlayerForNum(UINT8 pnum) +{ + return (&players[P_GetLocalPlayerNumForNum(pnum)]); +} + INT32 P_GetLocalPlayerNumForPlayer(const player_t *player) { for (UINT8 i = 0; i <= splitscreen; i++) @@ -1912,7 +1912,7 @@ static void P_3dMovement(player_t *player) if (analogmove) { - movepushangle = (cmd->angleturn<<16 /* not FRACBITS */); + movepushangle = (cmd->angleturn << TICCMD_REDUCE); } else { @@ -2072,7 +2072,7 @@ static void P_SpectatorMovement(player_t *player) { ticcmd_t *cmd = &player->cmd; - player->mo->angle = (angle_t)(cmd->angleturn<<16 /* not FRACBITS */); + player->mo->angle = (angle_t)(cmd->angleturn << TICCMD_REDUCE); ticruned++; if (!(cmd->angleturn & TICCMD_RECEIVED)) @@ -2278,7 +2278,7 @@ static void P_MovePlayer(player_t *player) { // KART: Don't directly apply angleturn! It may have been either A) forged by a malicious client, or B) not be a smooth turn due to a player dropping frames. // Instead, turn the player only up to the amount they're supposed to turn accounting for latency. Allow exactly 1 extra turn unit to try to keep old replays synced. - angle_diff = cmd->angleturn - (player->mo->angle>>16); + angle_diff = cmd->angleturn - (player->mo->angle >> TICCMD_REDUCE); max_left_turn = player->lturn_max[(leveltime + MAXPREDICTTICS - cmd->latency) % MAXPREDICTTICS]; max_right_turn = player->rturn_max[(leveltime + MAXPREDICTTICS - cmd->latency) % MAXPREDICTTICS]; @@ -2291,18 +2291,18 @@ static void P_MovePlayer(player_t *player) else { // Try to keep normal turning as accurate to 1.0.1 as possible to reduce replay desyncs. - player->mo->angle = cmd->angleturn<<16; + player->mo->angle = cmd->angleturn << TICCMD_REDUCE; add_delta = false; } //CONS_Printf("applied turn: %d\n", angle_diff); if (add_delta) { - player->mo->angle += angle_diff<<16; + player->mo->angle += angle_diff << TICCMD_REDUCE; player->mo->angle &= ~0xFFFF; // Try to keep the turning somewhat similar to how it was before? //CONS_Printf("leftover turn (%s): %5d or %4d%%\n", // player_names[player-players], - // (INT16) (cmd->angleturn - (player->mo->angle>>16)), - // (INT16) (cmd->angleturn - (player->mo->angle>>16)) * 100 / (angle_diff ? angle_diff : 1)); + // (INT16) (cmd->angleturn - (player->mo->angle >> TICCMD_REDUCE)), + // (INT16) (cmd->angleturn - (player->mo->angle >> TICCMD_REDUCE)) * 100 / (angle_diff ? angle_diff : 1)); } } @@ -3167,7 +3167,7 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) lang = cam->localangle; laim = cam->localaiming; - cmd->angleturn = (INT16)(lang >> 16); + cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE); cmd->aiming = G_ClipAimingPitch(&laim); const boolean analogjoystickmove = cv_usejoystick[num].value && !Joystick[num].bGamepadStyle; @@ -3320,7 +3320,7 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) cmd->sidemove = (SINT8)(cmd->sidemove + side); } - lang += (cmd->angleturn << 16); + lang += (cmd->angleturn << TICCMD_REDUCE); cam->localangle = lang; if (!cam->reset_aiming) @@ -3350,7 +3350,7 @@ static void P_DemoCameraMovement(camera_t *cam, UINT8 num) cam->aiming = cmd->aiming << FRACBITS; } - cam->angle = cmd->angleturn << 16; + cam->angle = cmd->angleturn << TICCMD_REDUCE; // camera movement: if (!cam->button_a_held) @@ -3830,7 +3830,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall // Sometimes stale ticcmds send a weird angle at the start of the race. // P_UpdatePlayerAngle knows to ignore cmd angle when you literally can't turn, so we do the same here. if (cv_demoangturn.value && leveltime > starttime) - focusangle = player->cmd.angleturn << 16; + focusangle = player->cmd.angleturn << TICCMD_REDUCE; else focusangle = mo->angle; // Just use something known sane. focusaiming = 0;