zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 15:22:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- revise last script a bit: allow certain cheats/scripts/events to be called from the menu.

Browse source
This commit is contained in:
Rachael Alexanderson 2017-12-14 16:39:33 -05:00
parent f77ba14948
commit dee5d064e9
1 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/c_dispatch.cpp
View file

@ -126,7 +126,7 @@ FButtonStatus Button_Mlook, Button_Klook, Button_Use, Button_AltAttack,
Button_AM_PanLeft, Button_AM_PanRight, Button_AM_PanDown, Button_AM_PanUp, Button_AM_PanLeft, Button_AM_PanRight, Button_AM_PanDown, Button_AM_PanUp,
Button_AM_ZoomIn, Button_AM_ZoomOut; Button_AM_ZoomIn, Button_AM_ZoomOut;
bool ParsingKeyConf; bool ParsingKeyConf, ParsingMenuDef = false;
// To add new actions, go to the console and type "key <action name>". // To add new actions, go to the console and type "key <action name>".
// This will give you the key value to use in the first column. Then // This will give you the key value to use in the first column. Then
@ -187,6 +187,21 @@ static const char *KeyConfCommands[] =
"clearplayerclasses" "clearplayerclasses"
}; };
static const char *MenuDefCommands[] =
{
"snd_reset",
"reset2defaults",
"menuconsole",
"clearnodecache",
"am_restorecolors",
"special",
"puke",
"fpuke",
"pukename",
"event",
"netevent"
};
// CODE -------------------------------------------------------------------- // CODE --------------------------------------------------------------------
IMPLEMENT_CLASS(DWaitingCommand, false, false) IMPLEMENT_CLASS(DWaitingCommand, false, false)
@ -584,6 +599,25 @@ void C_DoCommand (const char *cmd, int keynum)
} }
} }
if (ParsingMenuDef)
{
int i;
for (i = countof(MenuDefCommands)-1; i >= 0; --i)
{
if (strnicmp (beg, MenuDefCommands[i], len) == 0 &&
MenuDefCommands[i][len] == 0)
{
break;
}
}
if (i < 0)
{
Printf ("Invalid command for MENUDEF/ZScript: %s\n", beg);
return;
}
}
// Check if this is an action // Check if this is an action
if (*beg == '+' || *beg == '-') if (*beg == '+' || *beg == '-')
{ {
@ -664,29 +698,15 @@ void C_DoCommand (const char *cmd, int keynum)
} }
} }
#define ZS_SAFE_COMMAND(ccmd) if (stricmp(cmd, #ccmd) == 0) return true;
bool C_ZSIsSafe(FString cmd)
{
ZS_SAFE_COMMAND(snd_reset)
ZS_SAFE_COMMAND(reset2defaults)
ZS_SAFE_COMMAND(menuconsole)
ZS_SAFE_COMMAND(clearnodecache)
ZS_SAFE_COMMAND(am_restorecolors)
return false;
}
// This is only accessible to the special menu item to run CCMDs. // This is only accessible to the special menu item to run CCMDs.
DEFINE_ACTION_FUNCTION(DOptionMenuItemCommand, DoCommand) DEFINE_ACTION_FUNCTION(DOptionMenuItemCommand, DoCommand)
{ {
if (CurrentMenu == nullptr) return 0; if (CurrentMenu == nullptr) return 0;
PARAM_PROLOGUE; PARAM_PROLOGUE;
PARAM_STRING(cmd); PARAM_STRING(cmd);
if (C_ZSIsSafe(cmd)) ParsingMenuDef = true;
C_DoCommand(cmd); C_DoCommand(cmd);
else ParsingMenuDef = false;
Printf("Script attempted to call unsafe command '%s'\n", cmd);
return 0; return 0;
} }