X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qc;h=af14e0842b4dc749897a45e7fc2f18ae2dcaf6c4;hb=ca58ddddb186ef544c54791364ceb626c7f435d9;hp=9b617ab8a16eaa421a050b3732bb7890801af3b6;hpb=284c92dabbbdfcbb511e2688204622c5dcf01ac1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 9b617ab8a..af14e0842 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -17,8 +17,8 @@
 
 #include "xonotic/util.qh"
 
-#include "../common/items/all.qh"
-#include <common/weapons/all.qh>
+#include "../common/items/_mod.qh"
+#include <common/weapons/_all.qh>
 #include "../common/mapinfo.qh"
 #include "../common/mutators/base.qh"
 
@@ -69,7 +69,7 @@ void m_init()
 	cvar_set("_menu_prvm_language", prvm_language);
 
 #ifdef WATERMARK
-		LOG_INFOF("^4MQC Build information: ^1%s\n", WATERMARK);
+		LOG_INFOF("^4MQC Build information: ^1%s", WATERMARK);
 #endif
 
 	// list all game dirs (TEST)
@@ -237,7 +237,7 @@ void m_keyup(float key, float ascii)
 		if (mouseButtonsPressed < 0)
 		{
 			mouseButtonsPressed = 0;
-			LOG_TRACE("Warning: released an already released button\n");
+			LOG_TRACE("Warning: released an already released button");
 		}
 	}
 	if (key == K_ALT) menuShiftState &= ~S_ALT;
@@ -286,7 +286,7 @@ void m_keydown(float key, float ascii)
 		if (mouseButtonsPressed > 10)
 		{
 			mouseButtonsPressed = 10;
-			LOG_TRACE("Warning: pressed an already pressed button\n");
+			LOG_TRACE("Warning: pressed an already pressed button");
 		}
 	}
 	if (key == K_ALT) menuShiftState |= S_ALT;
@@ -849,6 +849,7 @@ void m_draw(float width, float height)
 	postMenuDraw();
 
 	frametime = 0;
+	IL_ENDFRAME();
 }
 
 void m_display()
@@ -976,6 +977,8 @@ void m_goto(string itemname)
 
 		if ((e) && (!e.requiresConnection || (gamestatus & (GAME_ISSERVER | GAME_CONNECTED))))
 		{
+			if(!Menu_Active)
+				e.hideMenuOnClose = true;
 			m_hide();
 			m_activate_window(e);
 			m_setpointerfocus(e);