OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- the keybinding control works again, this time fully scripted.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-12 18:38:23 +01:00
commit dbf3530696
19 changed files with 161 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/menu/menu.cpp
View file

@ -191,6 +191,26 @@ bool DMenu::Responder (event_t *ev)
return false;
}
DEFINE_ACTION_FUNCTION(DMenu, Responder)
{
PARAM_SELF_PROLOGUE(DMenu);
PARAM_POINTER(ev, event_t);
ACTION_RETURN_BOOL(self->Responder(ev));
}
bool DMenu::CallResponder(event_t *ev)
{
IFVIRTUAL(DMenu, Responder)
{
VMValue params[] = { (DObject*)this, ev};
int retval;
VMReturn ret(&retval);
GlobalVMStack.Call(func, params, 2, &ret, 1, nullptr);
return !!retval;
}
else return Responder(ev);
}
//=============================================================================
//
//
@ -386,6 +406,20 @@ void DMenu::CallDrawer()
else Drawer();
}
DEFINE_ACTION_FUNCTION(DMenu, Close)
{
PARAM_SELF_PROLOGUE(DMenu);
self->Close();
return 0;
}
DEFINE_ACTION_FUNCTION(DMenu, GetItem)
{
PARAM_SELF_PROLOGUE(DMenu);
PARAM_NAME(name);
ACTION_RETURN_POINTER(self->GetItem(name));
}
bool DMenu::DimAllowed()
@ -395,6 +429,14 @@ bool DMenu::DimAllowed()
bool DMenu::TranslateKeyboardEvents()
{
IFVIRTUAL(DMenu, TranslateKeyboardEvents)
{
VMValue params[] = { (DObject*)this };
int retval;
VMReturn ret(&retval);
GlobalVMStack.Call(func, params, countof(params), &ret, 1, nullptr);
return !!retval;
}
return true;
}
@ -444,6 +486,13 @@ void M_ActivateMenu(DMenu *menu)
GC::WriteBarrier(DMenu::CurrentMenu);
}
DEFINE_ACTION_FUNCTION(DMenu, ActivateMenu)
{
PARAM_SELF_PROLOGUE(DMenu);
M_ActivateMenu(self);
return 0;
}
//=============================================================================
//
//
@ -631,7 +680,7 @@ bool M_Responder (event_t *ev)
}
// pass everything else on to the current menu
return DMenu::CurrentMenu->Responder(ev);
return DMenu::CurrentMenu->CallResponder(ev);
}
else if (DMenu::CurrentMenu->TranslateKeyboardEvents())
{
@ -652,7 +701,7 @@ bool M_Responder (event_t *ev)
default:
if (!keyup)
{
return DMenu::CurrentMenu->Responder(ev);
return DMenu::CurrentMenu->CallResponder(ev);
}
break;
}
@ -739,7 +788,7 @@ bool M_Responder (event_t *ev)
return true;
}
}
return DMenu::CurrentMenu->Responder(ev) || !keyup;
return DMenu::CurrentMenu->CallResponder(ev) || !keyup;
}
else if (MenuEnabled)
{
@ -1094,6 +1143,8 @@ CCMD(reset2saved)
//native void OptionMenuDescriptor.CalcIndent();
//native OptionMenuItem OptionMenuDescriptor.GetItem(Name iname);
DEFINE_FIELD(DMenu, mParentMenu)
DEFINE_FIELD(DMenuDescriptor, mMenuName)
DEFINE_FIELD(DMenuDescriptor, mNetgameMessage)
DEFINE_FIELD(DMenuDescriptor, mClass)