OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added optional prompt argument to MENUDEF's SafeCommand

Browse source
This commit is contained in:
yqco 2016-07-27 15:52:33 -06:00 • committed by Christoph Oelckers
commit 58a6d7df1f
2 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/menu/menudef.cpp
View file

@ -781,7 +781,15 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
FString label = sc.String;
sc.MustGetStringName(",");
sc.MustGetString();
FOptionMenuItem *it = new FOptionMenuItemSafeCommand(label, sc.String);
FString command = sc.String;
FString prompt;
// Check for optional custom prompt
if (sc.CheckString(","))
{
sc.MustGetString();
prompt = sc.String;
}
FOptionMenuItem *it = new FOptionMenuItemSafeCommand(label, command, prompt);
desc->mItems.Push(it);
}
else if (sc.Compare("Control") || sc.Compare("MapControl"))