[Jake2-commits] jake2/src/jake2/client Menu.java,1.12,1.13

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27543/src/jake2/client

Modified Files:
	Menu.java 
Log Message:
fix menu stacking

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Menu.java	7 Oct 2004 14:13:00 -0000	1.12
--- Menu.java	22 Dec 2004 15:50:40 -0000	1.13
***************
*** 199,207 ****
                  Com.Error(ERR_FATAL, "PushMenu: MAX_MENU_DEPTH");
  
!             m_layers[m_menudepth].draw = m_drawfunc;
!             m_layers[m_menudepth].key = m_keyfunc;
!             m_menudepth++;
          }
! 
          m_drawfunc = draw;
          m_keyfunc = key;
--- 199,206 ----
                  Com.Error(ERR_FATAL, "PushMenu: MAX_MENU_DEPTH");
  
!             m_layers[m_menudepth].draw = draw;//m_drawfunc;
!             m_layers[m_menudepth].key = key;//m_keyfunc;     
          }
!         m_menudepth++;
          m_drawfunc = draw;
          m_keyfunc = key;
***************
*** 223,235 ****
      static void PopMenu() {
          S.StartLocalSound(menu_out_sound);
-         if (m_menudepth < 1)
-             Com.Error(ERR_FATAL, "PopMenu: depth < 1");
          m_menudepth--;
  
!         m_drawfunc = m_layers[m_menudepth].draw;
!         m_keyfunc = m_layers[m_menudepth].key;
  
          if (0 == m_menudepth)
              ForceMenuOff();
      }
  
--- 222,238 ----
      static void PopMenu() {
          S.StartLocalSound(menu_out_sound);
          m_menudepth--;
+         if (m_menudepth < 0)
+             Com.Error(ERR_FATAL, "PopMenu: depth < 1");
  
!         if (0 < m_menudepth){
! 	        m_drawfunc = m_layers[m_menudepth-1].draw;
! 	        m_keyfunc = m_layers[m_menudepth-1].key;
!         }
  
          if (0 == m_menudepth)
              ForceMenuOff();
+         
+         
      }
  
***************
*** 2906,2920 ****
      };
  
      static void Menu_StartServer_f() {
          StartServer_MenuInit();
!         PushMenu(new xcommand_t() {
!             public void execute() {
!                 StartServer_MenuDraw();
!             }
!         }, new keyfunc_t() {
!             public String execute(int key) {
!                 return StartServer_MenuKey(key);
!             }
!         });
      }
  
--- 2909,2925 ----
      };
  
+     static xcommand_t startServer_MenuDraw = new xcommand_t() {
+         public void execute() {
+             StartServer_MenuDraw();
+         }
+     };
+     static keyfunc_t startServer_MenuKey = new keyfunc_t() {
+         public String execute(int key) {
+             return StartServer_MenuKey(key);
+         }        
+     };
      static void Menu_StartServer_f() {
          StartServer_MenuInit();
!         PushMenu(startServer_MenuDraw, startServer_MenuKey);
      }