From cc9cadfac1e2dd6cb27c652cf948253dab6264cf Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 4 Oct 2020 22:46:04 +0200 Subject: [PATCH] - moved compatibility cruft out of main implementation file. --- wadsrc/static/zscript/ui/menu/doommenus.zs | 39 +++++++++++++++++++ .../static/zscript/ui/menu/optionmenuitems.zs | 39 ------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/wadsrc/static/zscript/ui/menu/doommenus.zs b/wadsrc/static/zscript/ui/menu/doommenus.zs index 96d9e4e5a9..6e727d4ae2 100644 --- a/wadsrc/static/zscript/ui/menu/doommenus.zs +++ b/wadsrc/static/zscript/ui/menu/doommenus.zs @@ -24,3 +24,42 @@ class CompatibilityMenu : OptionMenu } } +//============================================================================= +// +// Placeholder classes for overhauled video mode menu. Do not use! +// Their sole purpose is to support mods with full copy of embedded MENUDEF +// +//============================================================================= + +class OptionMenuItemScreenResolution : OptionMenuItem +{ + String mResTexts[3]; + int mSelection; + int mHighlight; + int mMaxValid; + + enum EValues + { + SRL_INDEX = 0x30000, + SRL_SELECTION = 0x30003, + SRL_HIGHLIGHT = 0x30004, + }; + + OptionMenuItemScreenResolution Init(String command) + { + return self; + } + + override bool Selectable() + { + return false; + } +} + +class VideoModeMenu : OptionMenu +{ + static bool SetSelectedSize() + { + return false; + } +} diff --git a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs index 95a27d0556..28b48310b7 100644 --- a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs +++ b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs @@ -1234,42 +1234,3 @@ class OptionMenuItemScaleSlider : OptionMenuItemSlider } -//============================================================================= -// -// Placeholder classes for overhauled video mode menu. Do not use! -// Their sole purpose is to support mods with full copy of embedded MENUDEF -// -//============================================================================= - -class OptionMenuItemScreenResolution : OptionMenuItem -{ - String mResTexts[3]; - int mSelection; - int mHighlight; - int mMaxValid; - - enum EValues - { - SRL_INDEX = 0x30000, - SRL_SELECTION = 0x30003, - SRL_HIGHLIGHT = 0x30004, - }; - - OptionMenuItemScreenResolution Init(String command) - { - return self; - } - - override bool Selectable() - { - return false; - } -} - -class VideoModeMenu : OptionMenu -{ - static bool SetSelectedSize() - { - return false; - } -}