X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qc;h=2dc73a8d22675d78d36d789408b907d6b40f2d75;hb=fc0e4c6f26156858a71e0ec62eb974fa11eec2f9;hp=b4c7ce746a8cd749a1eeed4cfd8d2d9b08b23da3;hpb=6c4aca14b76d71f2ebabb059cd1ee30f6cb7c790;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index b4c7ce746..2dc73a8d2 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -16,8 +16,6 @@ float menuInitialized;
 float menuNotTheFirstFrame;
 float menuMouseMode;
 
-void SUB_Null() { }
-
 void m_sync()
 {
 	updateCompression();
@@ -55,7 +53,7 @@ void m_init()
 	check_unacceptable_compiler_bugs();
 
 #ifdef WATERMARK
-	print(sprintf(_("^4MQC Build information: ^1%s\n"), WATERMARK()));
+	print(sprintf(_("^4MQC Build information: ^1%s\n"), WATERMARK));
 #endif
 
 	// list all game dirs (TEST)
@@ -73,8 +71,8 @@ void m_init()
 	}
 
 	// needs to be done so early because of the constants they create
-	RegisterWeapons();
-	RegisterGametypes();
+	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
+	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
 
 	float ddsload = cvar("r_texture_dds_load");
 	float texcomp = cvar("gl_texturecompression");
@@ -306,6 +304,9 @@ void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
 	isz_w = '1 0 0' + '0 1 0' * ((sz_y / sz_x) * (draw_scale_x / draw_scale_y));
 	isz_h = '0 1 0' + '1 0 0' * ((sz_x / sz_y) * (draw_scale_y / draw_scale_x));
 
+#ifdef GMQCC
+	isz = '0 0 0';
+#endif
 	switch(scalemode)
 	{
 		default:
@@ -686,7 +687,7 @@ void m_draw()
 		if(Menu_Active)
 		if(!cvar("menu_video_played"))
 		{
-			localcmd("cd loop $menu_cdtrack; play sound/announcer/default/welcome.ogg\n");
+			localcmd("cd loop $menu_cdtrack; play sound/announcer/default/welcome.wav\n");
 			menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading FIXME
 		}
 		// ALWAYS set this cvar; if we start but menu is not active, this means we want no background music!