X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_3dras.c;h=0619796a670b433167eb7f12017d0f0dafeadaec;hb=b7a1b307d1b7cb5fec3221d2f2b15af74791663d;hp=18860a5d76568aef4a2e6a70a1f700346ad3aae8;hpb=7ec974a923006e2886b1d5397e4e54ece0281173;p=xonotic%2Fdarkplaces.git

diff --git a/snd_3dras.c b/snd_3dras.c
index 18860a5d..0619796a 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"};
@@ -367,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);
 
@@ -596,7 +598,7 @@ int S_LoadSound(sfx_t *sfx, int complain){
 	void* decoder_ptr=NULL;
 	if(ras_version>0 && ras_dll){
 
-		fileext[4]=0; //Terminator
+		fileext[3]=0; //Terminator
 		// See if already loaded
 		if (sfx->rasptr) return true;
 
@@ -787,13 +789,13 @@ int S_StartSound_OnEnt (int entnum, int entchannel, sfx_t *sfx, float fvol, floa
 		S_KillChannel(now_c);
 	}else{ //We found no channel .... So we need to make a new one ...
 		channel_new_smart(&prev_c,&now_c);
-		now_c->entnum    =entnum;
-		now_c->entchannel=entchannel;
 		if(!now_c){
 			Con_Printf("S_StartSound_OnEnt: could not make new channel_t\n");
 			channel_delete_and_next(&prev_c,&now_c);
 			return -1;
 		}
+		now_c->entnum    =entnum;
+		now_c->entchannel=entchannel;
 	}
 
 	//Lets start the sound on the acquired sound source and channel