use *64.dll instead of *.dll on win64, this way we can include both 32bit and 64bit...

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index ede502866e66f32e7f3ae39002ad197e18f11ae5..fe590b1234d7e63ea81a5ef93f25854b653efc21 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -257,7 +257,10 @@ sfx_t *S_FindName (const char *name)
                return NULL;
 
        if (strlen (name) >= sizeof (sfx->name))
-               Host_Error ("S_FindName: sound name too long (%s)", name);
+       {
+               Con_Printf ("S_FindName: sound name too long (%s)", name);
+               return NULL;
+       }
 
        // Look for this sound in the list of known sfx
        for (sfx = known_sfx; sfx != NULL; sfx = sfx->next)
@@ -303,7 +306,10 @@ void S_FreeSfx (sfx_t *sfx, qboolean force)
                                break;
                        }
                if (prev_sfx == NULL)
-                       Sys_Error ("S_FreeSfx: Can't find SFX %s in the list!\n", sfx->name);
+               {
+                       Con_Printf ("S_FreeSfx: Can't find SFX %s in the list!\n", sfx->name);
+                       return;
+               }
        }
 
        // Free it
@@ -365,7 +371,7 @@ void S_ServerSounds (char serversound [][MAX_QPATH], unsigned int numsounds)
        for (sfx = known_sfx;sfx;sfx = sfxnext)
        {
                sfxnext = sfx->next;
-               S_FreeSfx (sfx);
+               S_FreeSfx (sfx, false);
        }
 }
 
@@ -497,12 +503,10 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
        else
        {
                // update sound origin if we know about the entity
-               if (ch->entnum > 0 && cls.state == ca_connected && cl_entities[ch->entnum].state_current.active)
+               if (ch->entnum > 0 && cls.state == ca_connected && cl_entities[ch->entnum].render.model)
                {
-                       //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]);
-                       VectorCopy(cl_entities[ch->entnum].state_current.origin, ch->origin);
-                       if (cl_entities[ch->entnum].state_current.modelindex && cl.model_precache[cl_entities[ch->entnum].state_current.modelindex] && cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->soundfromcenter)
-                               VectorMAMAM(1.0f, ch->origin, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmins, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmaxs, ch->origin);
+                       //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].persistent.trail_origin[0], cl_entities[ch->entnum].persistent.trail_origin[1], cl_entities[ch->entnum].persistent.trail_origin[2]);
+                       VectorCopy(cl_entities[ch->entnum].persistent.trail_origin, ch->origin);
                }
 
                // calculate stereo seperation and distance attenuation
@@ -515,6 +519,7 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
                // calculate the volumes
                ch->leftvol = (int) (scale + pan);
                ch->rightvol = (int) (scale - pan);
+               //Con_Printf("%f %f %f:%f %f %f:%f %f:%d %d\n", ch->origin[0], ch->origin[1], ch->origin[2], source_vec[0], source_vec[1], source_vec[2], scale, pan, ch->leftvol, ch->rightvol);
        }
 
        // Adjust volume of static sounds
@@ -564,7 +569,7 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 {
        channel_t *target_chan, *check;
        int             ch_idx;
-       size_t  skip;
+       int             skip;
 
        if (!sound_started || !sfx || nosound.integer)
                return -1;
@@ -574,6 +579,9 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
                return -1;
        }
 
+       if (entnum && entnum >= cl_max_entities)
+               CL_ExpandEntities(entnum);
+
        // Pick a channel to play on
        target_chan = SND_PickChannel(entnum, entchannel);
        if (!target_chan)
@@ -595,8 +603,8 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
                if (check->sfx == sfx && !check->pos)
                {
                        skip = 0.1 * sfx->format.speed;
-                       if (skip > sfx->total_length)
-                               skip = sfx->total_length;
+                       if (skip > (int)sfx->total_length)
+                               skip = (int)sfx->total_length;
                        if (skip > 0)
                                skip = rand() % skip;
                        target_chan->pos += skip;
@@ -1015,7 +1023,7 @@ void S_SoundList(void)
        {
                if (sfx->fetcher != NULL)
                {
-                       size = sfx->mempool->totalsize;
+                       size = (int)sfx->mempool->totalsize;
                        total += size;
                        Con_Printf ("%c%c%c%c(%2db, %6s) %8i : %s\n",
                                                (sfx->loopstart >= 0) ? 'L' : ' ',
@@ -1052,7 +1060,7 @@ qboolean S_LocalSound (const char *sound)
        // Local sounds must not be freed
        sfx->flags |= SFXFLAG_PERMANENTLOCK;
 
-       ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 1);
+       ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 0);
        if (ch_ind < 0)
                return false;