From bd15b40ac9a4eff6733fb5efcd6ba57414f28480 Mon Sep 17 00:00:00 2001
From: q3rally <q3rally@b95fa9d2-619b-4617-8743-2613d58f007a>
Date: Tue, 8 Mar 2011 02:52:15 +0000
Subject: [PATCH] fixed missing music in Menu and Credits

---
 engine/code/q3_ui/ui_credits.c     |  2 +-
 engine/code/q3_ui/ui_menu.c        |  2 +-
 engine/misc/nsis/q3rally-q3ctc.nsi |  2 +-
 q3rallycode.ppr                    | 32 +++++++++++++++++++-----------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/engine/code/q3_ui/ui_credits.c b/engine/code/q3_ui/ui_credits.c
index 7dbc7d23..1501d9d8 100644
--- a/engine/code/q3_ui/ui_credits.c
+++ b/engine/code/q3_ui/ui_credits.c
@@ -295,7 +295,7 @@ void UI_CreditMenu( void ) {
 	mvolume = trap_Cvar_VariableValue( "s_musicvolume" );
 	if(mvolume < 0.5)
 		trap_Cmd_ExecuteText( EXEC_APPEND, "s_musicvolume 0.5\n" );
-	trap_Cmd_ExecuteText( EXEC_APPEND, "music music/amp6_22k\n" );
+	trap_Cmd_ExecuteText( EXEC_APPEND, "music music/amp6_22k.ogg" );
 
 	// load the background shader
 #ifdef BACKGROUND_SHADER
diff --git a/engine/code/q3_ui/ui_menu.c b/engine/code/q3_ui/ui_menu.c
index 08c2056e..32a0d00a 100644
--- a/engine/code/q3_ui/ui_menu.c
+++ b/engine/code/q3_ui/ui_menu.c
@@ -487,7 +487,7 @@ void UI_MainMenu( void ) {
 //      int             style = UI_CENTER | UI_DROPSHADOW;
         int             style = UI_RIGHT | UI_DROPSHADOW;
 
-        trap_Cmd_ExecuteText( EXEC_APPEND, "music music/q3r_menumusic\n" );
+        trap_Cmd_ExecuteText( EXEC_APPEND, "music music/q3r_menumusic.ogg" );
 // END
 
         trap_Cvar_Set( "sv_killserver", "1" );
diff --git a/engine/misc/nsis/q3rally-q3ctc.nsi b/engine/misc/nsis/q3rally-q3ctc.nsi
index ff1233f8..c94699f3 100644
--- a/engine/misc/nsis/q3rally-q3ctc.nsi
+++ b/engine/misc/nsis/q3rally-q3ctc.nsi
@@ -26,7 +26,7 @@
 ; no need to edit below in theory
 
 !define GAMENAME "Q3Rally"
-!define CLIENT "q3rally.x86.exe"
+!define CLIENT "q3rally.exe"
 !define GAMEDIR "Q3Rally"
 !define GAME_FSNAME "q3rally"
 
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index 411cee24..631805d7 100644
--- a/q3rallycode.ppr
+++ b/q3rallycode.ppr
@@ -13,7 +13,7 @@ ProjectFilesOnly=0
 [Project tree]
 q3rallycode
 	+engine
-		-code
+		+code
 			-AL
 				engine\code\AL\al.h
 				engine\code\AL\alc.h
@@ -424,7 +424,7 @@ q3rallycode
 				engine\code\null\null_main.c
 				engine\code\null\null_net.c
 				engine\code\null\null_snddma.c
-			-q3_ui
+			+q3_ui
 				engine\code\q3_ui\ui.def
 				engine\code\q3_ui\ui_addbots.c
 				engine\code\q3_ui\ui_atoms.c
@@ -751,12 +751,12 @@ q3rallycode
 				engine\misc\msvc\quake3.vcproj
 				engine\misc\msvc\ui.def
 				engine\misc\msvc\ui.vcproj
-			-nsis
+			+nsis
 				engine\misc\nsis\Makefile
 				engine\misc\nsis\q3rally.nsi.in
 				engine\misc\nsis\q3rally-q3ctc.nsi
-			-osxfe
-				-ioquake3fe
+			+osxfe
+				+ioquake3fe
 					-English.lproj
 						engine\misc\osxfe\ioquake3fe\English.lproj\ErrorWindow.xib
 						engine\misc\osxfe\ioquake3fe\English.lproj\InfoPlist.strings
@@ -777,11 +777,11 @@ q3rallycode
 					engine\misc\osxfe\ioquake3fe\ioquake3.icns
 					engine\misc\osxfe\ioquake3fe\ioquake3fe_Prefix.pch
 					engine\misc\osxfe\ioquake3fe\main.m
-			-setup
+			+setup
 				+MacOSX
 					engine\misc\setup\MacOSX\SLA-dmg.sh
 				+pkg
-					-ioquake3
+					+ioquake3
 						engine\misc\setup\pkg\ioquake3\depend
 						engine\misc\setup\pkg\ioquake3\pkginfo.template
 						engine\misc\setup\pkg\ioquake3\postinstall
@@ -858,15 +858,17 @@ q3rallycode
 2=engine\misc\setup\setup.xml.in
 3=engine\code\game\bg_public.h
 4=engine\code\qcommon\q_shared.h
+5=engine\code\q3_ui\ui_menu.c
+6=engine\code\q3_ui\ui_credits.c
 [Selected Project Files]
 Main=
-Selected=engine\code\qcommon\q_shared.h
+Selected=engine\code\q3_ui\ui_credits.c
 [engine\misc\nsis\q3rally.nsi.in]
-TopLine=40
-Caret=46,40
+TopLine=1
+Caret=1,18
 [engine\misc\nsis\q3rally-q3ctc.nsi]
-TopLine=29
-Caret=1,29
+TopLine=1
+Caret=24,29
 [engine\misc\setup\setup.xml.in]
 TopLine=8
 Caret=1,22
@@ -876,3 +878,9 @@ Caret=65,34
 [engine\code\qcommon\q_shared.h]
 TopLine=33
 Caret=40,47
+[engine\code\q3_ui\ui_menu.c]
+TopLine=476
+Caret=74,490
+[engine\code\q3_ui\ui_credits.c]
+TopLine=289
+Caret=62,298