Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Newmenus: Fire MENU_TIMEOUT on menuselect client command

Browse Source
This commit is contained in:
Valentin Grünbacher 2014-05-21 18:47:20 +02:00
parent 2e8ce87c23
commit 6a4c55de7d
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
amxmodx/meta_api.cpp
View File

@ -961,12 +961,30 @@ void C_ClientCommand(edict_t *pEntity)
if (pPlayer->keys & bit_key) if (pPlayer->keys & bit_key)
{ {
if ((pPlayer->menu > 0 && !pPlayer->vgui) && (gpGlobals->time > pPlayer->menuexpire)) if (gpGlobals->time > pPlayer->menuexpire)
{ {
pPlayer->menu = 0; int menu = pPlayer->newmenu;
pPlayer->keys = 0; if (menu >= 0 && menu < (int)g_NewMenus.size() && g_NewMenus[menu])
{
Menu *pMenu = g_NewMenus[menu];
RETURN_META(MRES_SUPERCEDE); pPlayer->newmenu = -1;
pPlayer->menu = 0;
executeForwards(pMenu->func,
static_cast<cell>(pPlayer->index),
static_cast<cell>(menu),
static_cast<cell>(MENU_TIMEOUT));
RETURN_META(MRES_SUPERCEDE);
}
else if (pPlayer->menu > 0 && !pPlayer->vgui)
{
pPlayer->menu = 0;
pPlayer->keys = 0;
RETURN_META(MRES_SUPERCEDE);
}
} }
int menuid = pPlayer->menu; int menuid = pPlayer->menu;