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

Newmenus: Add get_menu_by_id and use it everywhere

Browse Source
This commit is contained in:
Valentin Grünbacher
2014-05-27 10:33:53 +02:00
parent c91d67912b
commit a6ffae72f5
5 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
amxmodx/meta_api.cpp
View File

@ -963,10 +963,8 @@ void C_ClientCommand(edict_t *pEntity)
{
if (gpGlobals->time > pPlayer->menuexpire)
{
int menu = pPlayer->newmenu;
if (menu >= 0 && menu < (int)g_NewMenus.size() && g_NewMenus[menu])
if (Menu *pMenu = get_menu_by_id(pPlayer->newmenu))
{
Menu *pMenu = g_NewMenus[menu];
pMenu->Close(pPlayer->index);
RETURN_META(MRES_SUPERCEDE);
@ -989,10 +987,8 @@ void C_ClientCommand(edict_t *pEntity)
{
int menu = pPlayer->newmenu;
pPlayer->newmenu = -1;
if (menu >= 0 && menu < (int)g_NewMenus.size() && g_NewMenus[menu])
if (Menu *pMenu = get_menu_by_id(menu))
{
Menu *pMenu = g_NewMenus[menu];
int item = pMenu->PagekeyToItem(pPlayer->page, pressed_key+1);
if (item == MENU_BACK)
{