From 712414817b946a82b60e2a66ed00cb69bc4aaf36 Mon Sep 17 00:00:00 2001
From: pastel <pastrypastel@proton.me>
Date: Tue, 28 May 2024 13:51:29 -0500
Subject: [PATCH] also fix ticcmd intro crash
---
src/g_game.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/g_game.c b/src/g_game.c
index ed9e883623..bf369d111b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1386,6 +1386,13 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (PLAYERINPUTDOWN(ssplayer, GC_SPIN) || (usejoystick && axis > 0))
cmd->buttons |= BT_SPIN;
+ if (gamestate != GS_LEVEL) // not in a level, don't build anything else
+ {
+ cmd->angleturn = ticcmd_oldangleturn[forplayer];
+ cmd->aiming = G_ClipAimingPitch(myaiming);
+ return;
+ }
+
// Centerview can be a toggle in simple mode!
{
static boolean last_centerviewdown[2], centerviewhold[2]; // detect taps for toggle behavior
@@ -1717,7 +1724,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
// At this point, cmd doesn't contain the final angle yet,
// So we need to temporarily transform it so Lua scripters
// don't need to handle it differently than in other hooks.
- if (addedtogame && gamestate == GS_LEVEL)
+ if (addedtogame)
{
INT16 extra = ticcmd_oldangleturn[forplayer] - player->oldrelangleturn;
INT16 origangle = cmd->angleturn;
--
GitLab