From 75df86da2f83037bf23581b15b584f0beebd2c3e Mon Sep 17 00:00:00 2001
From: SinnamonLat <hyperclassic3@gmail.com>
Date: Fri, 10 Dec 2021 16:15:54 +0100
Subject: [PATCH] extras menu: addons

---
 src/k_menudef.c  | 2 +-
 src/k_menudraw.c | 8 ++++++++
 src/k_menufunc.c | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/k_menudef.c b/src/k_menudef.c
index 6260e9ea5..594d4475d 100644
--- a/src/k_menudef.c
+++ b/src/k_menudef.c
@@ -1110,7 +1110,7 @@ menuitem_t EXTRAS_Main[] =
 {
 
 	{IT_STRING | IT_CALL, "Addons", "Add files to customize your experience.",
-		NULL, NULL, 0, 0},
+		NULL, M_Addons, 0, 0},
 
 	{IT_STRING | IT_CALL, "Replay Hut", "Play the replays you've saved throughout your many races & battles!",
 		NULL, NULL, 0, 0},
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 1ddbd40d4..a865fcb97 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -2543,6 +2543,14 @@ void M_DrawAddons(void)
 
 	M_CacheAddonPatches();
 
+	// hack: If we're calling this from GS_MENU, that means we're in the extras menu!
+	// so draw the apropriate background
+	if (gamestate == GS_MENU)
+	{
+		patch_t *bg = W_CachePatchName("M_XTRABG", PU_CACHE);
+		V_DrawFixedPatch(0, 0, FRACUNIT, 0, bg, NULL);
+	}
+
 	// hack - need to refresh at end of frame to handle addfile...
 	if (refreshdirmenu & M_AddonsRefresh())
 	{
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index cd5b09a94..15cbf7316 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -3839,7 +3839,7 @@ void M_Addons(INT32 choice)
 		dir_on[menudepthleft] = 0;
 
 	MISC_AddonsDef.prevMenu = currentMenu;
-	M_SetupNextMenu(&MISC_AddonsDef, false);
+	M_SetupNextMenu(&MISC_AddonsDef, true);	// No transitions.
 }