From b365116dca85ab32cb808dbd8d80e02250381da5 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 26 Nov 2011 19:27:25 +0100 Subject: [PATCH] m_toggle takes a parameter, fix its definition and actually make use of that parameter. Now togglemenu 0/1 works as intended to switch the menu on/off. --- qcsrc/menu/menu.qc | 10 +++++++++- qcsrc/menu/msys.qh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index f5c0f6da5d..2b0a636bb5 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -819,12 +819,20 @@ void m_hide() main.hideNotify(main); } -void m_toggle() +void m_toggle(float mode) { if(Menu_Active) + { + if (mode == 1) + return; m_hide(); + } else + { + if (mode == 0) + return; m_display(); + } } void m_shutdown() diff --git a/qcsrc/menu/msys.qh b/qcsrc/menu/msys.qh index f2fa30e743..7e05dab1ed 100644 --- a/qcsrc/menu/msys.qh +++ b/qcsrc/menu/msys.qh @@ -19,7 +19,7 @@ void() m_init; void(float keynr, float ascii) m_keydown; void() m_draw; void() m_display; // old NG Menu -void() m_toggle; +void(float mode) m_toggle; void() m_hide; // old NG Menu void() m_shutdown; -- 2.39.2