zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- OptionMenu.Init must be declared 'virtual'

This commit is contained in:
Christoph Oelckers 2017-02-12 21:56:01 +01:00
parent b6ad14a614
commit 9ece757cb3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wadsrc/static/zscript/menu/menu.txt
View File

@ -214,7 +214,7 @@ class OptionMenu : Menu native
//
//=============================================================================
void Init(Menu parent, OptionMenuDescriptor desc)
virtual void Init(Menu parent, OptionMenuDescriptor desc)
{
mParentMenu = parent;
mDesc = desc;

6
wadsrc/static/zscript/menu/optionmenuitems.txt
View File

@ -852,8 +852,12 @@ class OptionMenuItemColorPicker : OptionMenuItem
if (mCVar != null)
{
Menu.MenuSound("menu/choose");
let desc = MenuDescriptor.GetDescriptor('Colorpickermenu');
// This code is a bit complicated because it should allow subclassing the
// colorpicker menu.
// New color pickers must inherit from the internal one to work here.
let desc = MenuDescriptor.GetDescriptor('Colorpickermenu');
if (desc != NULL && (desc.mClass == null || desc.mClass is "ColorPickerMenu"))
{
let odesc = OptionMenuDescriptor(desc);