Merge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_s...

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c

diff --combined qcsrc/menu/menu.qc
index e7fc1665a2c85040eda2fb2e8c327a9c77ae557f,121ceea5b5c0ff07fce160462d581fcc8540c60d..7bec34ea0b0a1ff91aad1c9ed91d051f34ca7fc9
--- 1/qcsrc/menu/menu.qc
--- 2/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@@ -270,9 -270,6 +270,9 @@@ void draw_Picture_Aligned(vector algn, 
  
  void(string img, float a, string algn, float force1) drawBackground =
  {
 +      if(main.mainNexposee.ModalController_state == 0)
 +              return;
 +
        vector v;
        float i, l;
        string c;
@@@ -762,8 -759,9 +762,9 @@@ void() m_shutdown 
        m_hide();
        for(e = NULL; (e = nextent(e)) != NULL; )
        {
-               if(e.destroy)
-                       e.destroy(e);
+               if(e.classname != "vtbl")
+                       if(e.destroy)
+                               e.destroy(e);
        }
  };
  
@@@ -795,7 -793,7 +796,7 @@@ void m_activate_window(entity wnd
                // nexposee (sorry for violating abstraction here)
                par.selectedChild = wnd;
                par.animationState = 1;
-               setFocusContainer(par, NULL);
+               Container_setFocus(par, NULL);
        }
        else if(par.instanceOfContainer)
        {