From e6cf33d64ed578b3bb5698f9504da662ff2778fe Mon Sep 17 00:00:00 2001
From: Skydusk <lightacecz@gmail.com>
Date: Wed, 14 May 2025 17:04:02 +0000
Subject: [PATCH] SRB2 Classic fixes
---
src/lua_hook.h | 2 +-
src/lua_hooklib.c | 2 +-
src/m_menu.c | 10 ++++------
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/lua_hook.h b/src/lua_hook.h
index fa8f0ff4c8..f49912d871 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -129,7 +129,7 @@ int LUA_HookCharacterHUD
INT32 skinIndex, UINT8 sprite2, UINT8 frame, UINT8 rotation, skincolornum_t color,
INT32 ticker, boolean mode
);
-int LUA_HookEscapePanel(
+boolean LUA_HookEscapePanel(
int hook, huddrawlist_h drawlist,
int x, int y, int width, int height
);
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index fd89694909..857a60405d 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -738,7 +738,7 @@ int LUA_HookCharacterHUD
return hook.status;
}
-int LUA_HookEscapePanel(int hook, huddrawlist_h drawlist, int x, int y, int width, int height)
+boolean LUA_HookEscapePanel(int hook, huddrawlist_h drawlist, int x, int y, int width, int height)
{
Hook_State hookstate;
if (prepare_hud_hook(&hookstate, false, hook))
diff --git a/src/m_menu.c b/src/m_menu.c
index 847db74713..e0b5793520 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -4751,7 +4751,10 @@ static void M_DrawPauseMenu(void)
LUA_HUD_DrawList(luahuddrawlist_infoscreen);
if (esc_override)
- goto draw_rest;
+ {
+ M_DrawGenericMenu();
+ return;
+ }
// Draw any and all emblems at the top.
M_DrawMapEmblems(gamemap, 272, 28, true);
@@ -4883,11 +4886,6 @@ static void M_DrawPauseMenu(void)
V_DrawRightAlignedString(284, 44 + (i*8), V_MONOSPACE, emblem_text[i]);
}
}
-
- draw_rest:
- {
- M_DrawGenericMenu();
- }
}
static void M_DrawCenteredMenu(void)
--
GitLab