Merge remote branch 'origin/mirceakitsune/weapon_mine_layer' into fruitiex/fruitbalance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / menu.qc

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 462337c05126cab5acbfe786cc1b0c23034df70c..7bec34ea0b0a1ff91aad1c9ed91d051f34ca7fc9 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -24,6 +24,10 @@ void() m_init =
 
        check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+       print("^4MQC Build information: ", WATERMARK(), "\n");
+#endif
+
        // list all game dirs (TEST)
        if(cvar("developer"))
        {
@@ -266,6 +270,9 @@ void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
 
 void(string img, float a, string algn, float force1) drawBackground =
 {
+       if(main.mainNexposee.ModalController_state == 0)
+               return;
+
        vector v;
        float i, l;
        string c;
@@ -755,8 +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);
        }
 };
 
@@ -788,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)
        {