X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=snd_main.c;h=1e9fd6ecc7812ba7487b9f1ae32f04e4248b3717;hb=a2335e296b76dd3477a80f8beeeedaf3e042c876;hp=9e2653283a8dcd3ad7de94ae84ca83c99688de94;hpb=f182457a2c06e0a8791f98aad243018a951a7101;p=xonotic%2Fdarkplaces.git

diff --git a/snd_main.c b/snd_main.c
index 9e265328..1e9fd6ec 100644
--- 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
@@ -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
@@ -1055,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;