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

Merge pull request #140 from Nextra/menu-recursion

Browse Source 
Fix recursion issues with show_menu and newmenus
This commit is contained in:
Vincent Herbet 2014-10-11 10:58:00 +02:00
commit 2e1a7b56d8
1 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
amxmodx/amxmodx.cpp
View File

@ -1251,22 +1251,13 @@ static cell AMX_NATIVE_CALL get_user_team(AMX *amx, cell *params) /* 3 param */
static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
{ {
int ilen = 0, ilen2 = 0; // If show_menu is called from within a newmenu callback upon receiving MENU_EXIT
char *sMenu = get_amxstring(amx, params[3], 0, ilen); // it is possible for this native to recurse. We need to close newmenus right away
char *lMenu = get_amxstring(amx, params[5], 1, ilen2); // because the recursive call would otherwise modify/corrupt the static get_amxstring
int menuid = 0; // buffer mid execution. This will either display incorrect text or result in UTIL_ShowMenu
// running into an infinite loop.
if (ilen2 && lMenu) int index = params[1];
{ if (index == 0)
menuid = g_menucmds.findMenuId(lMenu, amx);
} else {
menuid = g_menucmds.findMenuId(sMenu, amx);
}
int keys = params[2];
int time = params[4];
if (params[1] == 0)
{ {
for (int i = 1; i <= gpGlobals->maxClients; ++i) for (int i = 1; i <= gpGlobals->maxClients; ++i)
{ {
@ -1282,23 +1273,11 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
pMenu->Close(pPlayer->index); pMenu->Close(pPlayer->index);
UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0); UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
}
pPlayer->keys = keys; }
pPlayer->menu = menuid; }
pPlayer->vgui = false;
if (time == -1)
pPlayer->menuexpire = INFINITE;
else else
pPlayer->menuexpire = gpGlobals->time + static_cast<float>(time); {
pPlayer->page = 0;
UTIL_ShowMenu(pPlayer->pEdict, keys, time, sMenu, ilen);
}
}
} else {
int index = params[1];
if (index < 1 || index > gpGlobals->maxClients) if (index < 1 || index > gpGlobals->maxClients)
{ {
LogError(amx, AMX_ERR_NATIVE, "Invalid player id %d", index); LogError(amx, AMX_ERR_NATIVE, "Invalid player id %d", index);
@ -1317,7 +1296,36 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
pMenu->Close(pPlayer->index); pMenu->Close(pPlayer->index);
UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0); UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
}
else
{
return 0;
}
}
int ilen = 0, ilen2 = 0;
char *sMenu = get_amxstring(amx, params[3], 0, ilen);
char *lMenu = get_amxstring(amx, params[5], 1, ilen2);
int menuid = 0;
if (ilen2 && lMenu)
{
menuid = g_menucmds.findMenuId(lMenu, amx);
} else {
menuid = g_menucmds.findMenuId(sMenu, amx);
}
int keys = params[2];
int time = params[4];
if (index == 0)
{
for (int i = 1; i <= gpGlobals->maxClients; ++i)
{
CPlayer* pPlayer = GET_PLAYER_POINTER_I(i);
if (pPlayer->ingame)
{
pPlayer->keys = keys; pPlayer->keys = keys;
pPlayer->menu = menuid; pPlayer->menu = menuid;
pPlayer->vgui = false; pPlayer->vgui = false;
@ -1331,6 +1339,21 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
UTIL_ShowMenu(pPlayer->pEdict, keys, time, sMenu, ilen); UTIL_ShowMenu(pPlayer->pEdict, keys, time, sMenu, ilen);
} }
} }
} else {
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
pPlayer->keys = keys;
pPlayer->menu = menuid;
pPlayer->vgui = false;
if (time == -1)
pPlayer->menuexpire = INFINITE;
else
pPlayer->menuexpire = gpGlobals->time + static_cast<float>(time);
pPlayer->page = 0;
UTIL_ShowMenu(pPlayer->pEdict, keys, time, sMenu, ilen);
}
return 1; return 1;
} }