Fix unexpected behaviors when a game menu is overlapped with custom one (bug 3199, r=me)

Former-commit-id: 96390761d3
This commit is contained in:
Vincent HERBET 2013-06-16 22:33:48 +02:00
parent d5ce84a9f5
commit 5cb07b900a
2 changed files with 15 additions and 0 deletions

View File

@ -1058,6 +1058,11 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
if (pPlayer->ingame)
{
pPlayer->keys = 0;
pPlayer->menu = 0;
UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
pPlayer->keys = keys;
pPlayer->menu = menuid;
pPlayer->vgui = false;
@ -1085,6 +1090,11 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
if (pPlayer->ingame)
{
pPlayer->keys = 0;
pPlayer->menu = 0;
UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
pPlayer->keys = keys;
pPlayer->menu = menuid;
pPlayer->vgui = false;

View File

@ -305,6 +305,11 @@ bool Menu::Display(int player, page_t page)
CPlayer *pPlayer = GET_PLAYER_POINTER_I(player);
pPlayer->keys = 0;
pPlayer->menu = 0;
UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
pPlayer->keys = keys;
pPlayer->menu = menuId;
pPlayer->newmenu = thisId;