X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_3dras.c;h=8b71d2798082b59b00829a0d0632024ff376edca;hp=c984a3b465a582c9fa0bf0fcf6d3df2b08d426d6;hb=97d3f3a9721b9a5e696adb4262e7d3b3964ef892;hpb=a0593ee6b57c492e4ec9c4f1e62d0dc0114f119c

diff --git a/snd_3dras.c b/snd_3dras.c
index c984a3b4..8b71d279 100644
--- a/snd_3dras.c
+++ b/snd_3dras.c
@@ -5,6 +5,7 @@
 #include "snd_3dras.h"
 
 cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"};
+cvar_t mastervolume = {CVAR_SAVE, "mastervolume", "1", "master volume"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7", "volume of sound effects"};
 cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"};
 cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
@@ -114,15 +115,13 @@ static dllfunction_t ras_funcs[] =
 };
 static const char* ras_dllname [] =
 {
-	#if defined(WIN64)
-		"3dras64.dll",
-	#elif defined(WIN32)
+#if defined(WIN32)
 		"3dras32.dll",
-	#elif defined(MACOSX)
+#elif defined(MACOSX)
 		"3dras.dylib",
-	#else
+#else
 		"3dras.so",
-	#endif
+#endif
 		NULL
 };
 
@@ -369,6 +368,7 @@ void S_Init (void){
 			Con_Printf ("Version %i found\n",ras_version);
 			Cvar_RegisterVariable(&volume);
 			Cvar_RegisterVariable(&bgmvolume);
+			Cvar_RegisterVariable(&mastervolume);
 			Cvar_RegisterVariable(&snd_staticvolume);
 			Cvar_RegisterVariable(&snd_precache);