From 2f2d0443f253adf49c35b91d409f66b7406eb7d5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 1 Mar 2021 13:08:10 +0100 Subject: [PATCH] - fixed size setup for most menus. All of Raze's menus scale to 320x200 and to get proper mouse coordinates the definitions must reflect that as well. Fixes #271 --- source/common/engine/printf.h | 1 + wadsrc/static/menudef.txt | 4 ++++ wadsrc/static/zscript/engine/ui/menu/listmenu.zs | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/common/engine/printf.h b/source/common/engine/printf.h index 35efdd5fd..3c6164f76 100644 --- a/source/common/engine/printf.h +++ b/source/common/engine/printf.h @@ -86,6 +86,7 @@ int Printf (int printlevel, const char *format, ...) ATTRIBUTE((format(printf,2, int Printf (const char *format, ...) ATTRIBUTE((format(printf,1,2))); int DPrintf (int level, const char *format, ...) ATTRIBUTE((format(printf,2,3))); +void I_DebugPrint(const char* cp); void debugprintf(const char* f, ...); // Prints to the debugger's log. // flag to silence non-error output diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 7048e865c..0abec82cc 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -82,6 +82,7 @@ LISTMENU "MainMenu" LISTMENU "IngameMenu" { + Size 320, 200 ifgame(Duke, Nam, WW2GI, Redneck, RedneckRides) { position 160, 55 @@ -152,6 +153,7 @@ LISTMENU "IngameMenu" LISTMENU "EpisodeMenu" { + Size 320, 200 ifgame(Duke, Nam, WW2GI, Redneck, RedneckRides) { position 160, 48 @@ -176,6 +178,7 @@ LISTMENU "EpisodeMenu" LISTMENU "SkillMenu" { + Size 320, 200 ifgame(Duke, Nam, WW2GI, Redneck, RedneckRides) { position 160, 48 @@ -1719,6 +1722,7 @@ OptionValue "os_isanyof_values" /* LISTMENU "MultiMenu" { + Size 320, 200 ifgame(Duke, Nam, WW2GI) { position 160, 55, 135 diff --git a/wadsrc/static/zscript/engine/ui/menu/listmenu.zs b/wadsrc/static/zscript/engine/ui/menu/listmenu.zs index 6a2c9c1b0..c8a8a0f2e 100644 --- a/wadsrc/static/zscript/engine/ui/menu/listmenu.zs +++ b/wadsrc/static/zscript/engine/ui/menu/listmenu.zs @@ -246,7 +246,6 @@ class ListMenu : Menu y = int((y - fy) * h / fh); } - if (mFocusControl != NULL) { mFocusControl.MouseEvent(type, x, y);