always stream decode ogg, this reduces Nexuiz sound memory usage even

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index 540a7f9e7c8f140e0978eedc5aaf277b68f0c902..5f60089af00a4af2db292a7a17675c4800483c43 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -170,7 +170,6 @@ cvar_t snd_spatialization_occlusion = {CVAR_SAVE, "snd_spatialization_occlusion"
 
 // Cvars declared in snd_main.h (shared with other snd_*.c files)
 cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.11", "how much sound to mix ahead of time"};
-cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1", "enables keeping compressed ogg sound files compressed, decompressing them only as needed, otherwise they will be decompressed completely at load (may use a lot of memory)"};
 cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0", "swaps left/right speakers for old ISA soundblaster cards"};
 extern cvar_t v_flipped;
 cvar_t snd_channellayout = {0, "snd_channellayout", "0", "channel layout. Can be 0 (auto - snd_restart needed), 1 (standard layout), or 2 (ALSA layout)"};
@@ -844,7 +843,6 @@ void S_Init(void)
        Cvar_RegisterVariable(&nosound);
        Cvar_RegisterVariable(&snd_precache);
        Cvar_RegisterVariable(&snd_initialized);
-       Cvar_RegisterVariable(&snd_streaming);
        Cvar_RegisterVariable(&ambient_level);
        Cvar_RegisterVariable(&ambient_fade);
        Cvar_RegisterVariable(&snd_noextraupdate);
@@ -1239,13 +1237,13 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
        // update sound origin if we know about the entity
        if (ch->entnum > 0 && cls.state == ca_connected && cl_gameplayfix_soundsmovewithentities.integer)
        {
-               if (ch->entnum >= 32768)
+               if (ch->entnum >= MAX_EDICTS)
                {
                        //Con_Printf("-- entnum %i origin %f %f %f neworigin %f %f %f\n", ch->entnum, ch->origin[0], ch->origin[1], ch->origin[2], cl.entities[ch->entnum].state_current.origin[0], cl.entities[ch->entnum].state_current.origin[1], cl.entities[ch->entnum].state_current.origin[2]);
 
-                       if (ch->entnum > 32768)
+                       if (ch->entnum > MAX_EDICTS)
                                if (!CL_VM_GetEntitySoundOrigin(ch->entnum, ch->origin))
-                                       ch->entnum = 32768; // entity was removed, disown sound
+                                       ch->entnum = MAX_EDICTS; // entity was removed, disown sound
                }
                else if (cl.entities[ch->entnum].state_current.active)
                {
@@ -1264,7 +1262,7 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
                mastervol *= snd_staticvolume.value;
        else if(!(ch->flags & CHANNELFLAG_FULLVOLUME)) // same as SND_PaintChannel uses
        {
-               if(ch->entnum >= 32768)
+               if(ch->entnum >= MAX_EDICTS)
                {
                        switch(ch->entchannel)
                        {