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

Merge remote-tracking branch 'gzdoom/master' into qzdoom

This commit is contained in:
Magnus Norddahl 2017-02-14 14:55:02 +01:00
parent eac98ac226 443ac50887
commit 7f81e0bd26
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/menu/menu.cpp
View File

@ -381,7 +381,7 @@ void DMenu::Ticker ()
DEFINE_ACTION_FUNCTION(DMenu, Ticker) DEFINE_ACTION_FUNCTION(DMenu, Ticker)
{ {
PARAM_SELF_PROLOGUE(DMenu); PARAM_SELF_PROLOGUE(DMenu);
self->Drawer(); self->Ticker();
return 0; return 0;
} }
@ -392,7 +392,7 @@ void DMenu::CallTicker()
VMValue params[] = { (DObject*)this }; VMValue params[] = { (DObject*)this };
GlobalVMStack.Call(func, params, 1, nullptr, 0, nullptr); GlobalVMStack.Call(func, params, 1, nullptr, 0, nullptr);
} }
else Drawer(); else Ticker();
} }

3
src/menu/menudef.cpp
View File

@ -796,6 +796,9 @@ static void ParseOptionMenuBody(FScanner &sc, DOptionMenuDescriptor *desc)
auto cv = FindCVar(sc.String, nullptr); auto cv = FindCVar(sc.String, nullptr);
if (cv == nullptr && *sc.String) if (cv == nullptr && *sc.String)
{ {
if (func->Variants[0].ArgFlags[i] & VARF_Optional)
sc.ScriptMessage("Unknown CVar %s", sc.String);
else
sc.ScriptError("Unknown CVar %s", sc.String); sc.ScriptError("Unknown CVar %s", sc.String);
} }
params.Push(cv); params.Push(cv);