yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 04:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a CHANGELOG entry

Browse source
This commit is contained in:
Yamagi Burmeister 2012-02-27 11:33:32 +00:00
parent b70dc11672
commit d87328293c
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -1,3 +1,7 @@
Quake II 4.03 to 4.04
- Change the behavior of hotkey menus to fix some
strange bugs and memory leaks in the menu system.
Quake II 4.02 to 4.03 Quake II 4.02 to 4.03
- Fix wrong function call in the Quake II file system. - Fix wrong function call in the Quake II file system.
- Fix gl_ext_multitexture set to 1. (reported by Richard Allen - Fix gl_ext_multitexture set to 1. (reported by Richard Allen

16
src/client/menu/menu.c
View file

@ -134,15 +134,16 @@ static void M_PushMenu ( void (*draw) (void), const char *(*key) (int) ) {
&& Com_ServerState ()) && Com_ServerState ())
Cvar_Set ("paused", "1"); Cvar_Set ("paused", "1");
// if this menu is already open (and on top), close it => toggling behaviour /* if this menu is already open (and on top),
close it => toggling behaviour */
if(m_drawfunc == draw && m_keyfunc == key) if(m_drawfunc == draw && m_keyfunc == key)
{ {
M_PopMenu(); M_PopMenu();
return; return;
} }
/* if this menu is already present, drop back to that level /* if this menu is already present, drop back to
to avoid stacking menus by hotkeys */ that level to avoid stacking menus by hotkeys */
for (i=0 ; i<m_menudepth ; i++) for (i=0 ; i<m_menudepth ; i++)
{ {
if (m_layers[i].draw == draw && if (m_layers[i].draw == draw &&
@ -151,13 +152,14 @@ static void M_PushMenu ( void (*draw) (void), const char *(*key) (int) ) {
break; break;
} }
} }
while(alreadyPresent && i <= m_menudepth) { // menu was already opened further down the stack
// pop everything above the old instance of this menu and that instance itself /* menu was already opened further down the stack */
M_PopMenu(); // decrements m_menudepth while(alreadyPresent && i <= m_menudepth) {
M_PopMenu(); /* decrements m_menudepth */
} }
if (m_menudepth >= MAX_MENU_DEPTH) { if (m_menudepth >= MAX_MENU_DEPTH) {
Com_Printf("Too many menus open at the same time,\nclose some before opening another one!\n"); Com_Printf("Too many open menus!\n");
return; return;
} }
m_layers[m_menudepth].draw = m_drawfunc; m_layers[m_menudepth].draw = m_drawfunc;