From d33fa75eb01ff1a1c0f54058b36117a5cb8b6dc8 Mon Sep 17 00:00:00 2001 From: toaster Date: Sat, 4 Nov 2023 22:14:15 +0000 Subject: [PATCH] Disable the v1 Manual for now I really wanted to make a new manual work in time for launch. But no. It would likely be an irresponsible timesink at this stage. --- src/k_menu.h | 2 ++ src/menus/options-1.c | 2 ++ src/menus/transient/manual.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/k_menu.h b/src/k_menu.h index c02f29d50..c437fcd42 100644 --- a/src/k_menu.h +++ b/src/k_menu.h @@ -1132,7 +1132,9 @@ char *M_AddonsHeaderPath(void); extern consvar_t cv_dummyaddonsearch; extern consvar_t cv_dummyextraspassword; +#ifdef TODONEWMANUAL void M_Manual(INT32 choice); +#endif void M_HandleImageDef(INT32 choice); // K_MENUDRAW.C diff --git a/src/menus/options-1.c b/src/menus/options-1.c index 6d91ab224..cfd7339e3 100644 --- a/src/menus/options-1.c +++ b/src/menus/options-1.c @@ -31,8 +31,10 @@ menuitem_t OPTIONS_Main[] = {IT_STRING | IT_SUBMENU, "Data Options", "Miscellaneous data options such as the screenshot format.", NULL, {.submenu = &OPTIONS_DataDef}, 0, 0}, +#ifdef TODONEWMANUAL {IT_STRING | IT_CALL, "Tricks & Secrets", "Those who bother reading a game manual always get the edge over those who don't!", NULL, {.routine = M_Manual}, 0, 0}, +#endif }; // For options menu, the 'extra1' field will determine the background colour to use for... the background! (What a concept!) diff --git a/src/menus/transient/manual.c b/src/menus/transient/manual.c index e6ca008eb..23d2fe776 100644 --- a/src/menus/transient/manual.c +++ b/src/menus/transient/manual.c @@ -64,6 +64,7 @@ void M_HandleImageDef(INT32 choice) } // Opening manual +#ifdef TODONEWMANUAL void M_Manual(INT32 choice) { (void)choice; @@ -71,3 +72,4 @@ void M_Manual(INT32 choice) MISC_ManualDef.prevMenu = (choice == INT32_MAX ? NULL : currentMenu); M_SetupNextMenu(&MISC_ManualDef, true); } +#endif