zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 08:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

-- more work on the menu - episode and skill menus are working in DN3D.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-25 23:21:51 +01:00
parent d73f915c66
commit a74a670c99
20 changed files with 309 additions and 682 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/common/menu/listmenu.cpp
View file

@ -178,7 +178,7 @@ bool DListMenu::MenuEvent (int mkey, bool fromcontroller)
return true;
case MKEY_Enter:
if (mDesc->mSelectedItem >= 0 && mDesc->mItems[mDesc->mSelectedItem]->Activate())
if (mDesc->mSelectedItem >= 0 && mDesc->mItems[mDesc->mSelectedItem]->Activate(mDesc->mMenuName))
{
gi->MenuChooseSound();
}
@ -320,7 +320,7 @@ void FListMenuItem::DrawSelector(int xofs, int yofs, FTexture *tex)
}
}
bool FListMenuItem::Activate()
bool FListMenuItem::Activate(FName)
{
return false; // cannot be activated
}
@ -476,10 +476,9 @@ bool FListMenuItemSelectable::Selectable()
return mEnabled && !mHidden;
}
bool FListMenuItemSelectable::Activate()
bool FListMenuItemSelectable::Activate(FName caller)
{
M_SetMenu(mAction, mParam);
return true;
return M_SetMenu(mAction, mParam, caller);
}
FName FListMenuItemSelectable::GetAction(int *pparam)