#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"};
};
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
};
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);
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;
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