don't hexdump png images while reading them (why did it do this??)

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index 186fc0e56836f9d46d1682258fe02ea2d5af7770..ae11f0ca69e2a041ff66de6b67de3db929b50e01 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -549,12 +549,12 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
        vec3_t source_vec;
 
        // 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].state_current.active)
        {
-               //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].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);
        }
 
        mastervol = ch->master_vol;
@@ -569,7 +569,7 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
                for (i = 0;i < SND_LISTENERS;i++)
                {
                        vol = mastervol * snd_speakerlayout.listeners[i].ambientvolume;
-                       ch->listener_volume[i] = bound(0, vol, 255);
+                       ch->listener_volume[i] = (int)bound(0, vol, 255);
                }
        }
        else
@@ -585,7 +585,7 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
                                Matrix4x4_Transform(&listener_matrix[i], ch->origin, source_vec);
                                VectorNormalize(source_vec);
                                vol = intensity * max(0, source_vec[0] * snd_speakerlayout.listeners[i].dotscale + snd_speakerlayout.listeners[i].dotbias);
-                               ch->listener_volume[i] = bound(0, vol, 255);
+                               ch->listener_volume[i] = (int)bound(0, vol, 255);
                        }
                }
                else
@@ -604,7 +604,7 @@ void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags,
        // Initialize the channel
        memset (target_chan, 0, sizeof (*target_chan));
        VectorCopy (origin, target_chan->origin);
-       target_chan->master_vol = fvol * 255;
+       target_chan->master_vol = (int)(fvol * 255);
        target_chan->sfx = sfx;
        target_chan->end = paintedtime + sfx->total_length;
        target_chan->lastptime = paintedtime;
@@ -639,7 +639,7 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
                return -1;
        }
 
-       if (entnum && entnum >= cl_max_entities)
+       if (entnum && entnum >= cl.max_entities)
                CL_ExpandEntities(entnum);
 
        // Pick a channel to play on
@@ -662,7 +662,7 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
                        continue;
                if (check->sfx == sfx && !check->pos)
                {
-                       skip = 0.1 * sfx->format.speed;
+                       skip = (int)(0.1 * sfx->format.speed);
                        if (skip > (int)sfx->total_length)
                                skip = (int)sfx->total_length;
                        if (skip > 0)
@@ -783,7 +783,7 @@ void S_PauseGameSounds (qboolean toggle)
 
 void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
-       channels[ch_ind].master_vol = fvol * 255;
+       channels[ch_ind].master_vol = (int)(fvol * 255);
 }
 
 
@@ -828,7 +828,7 @@ S_UpdateAmbientSounds
 void S_UpdateAmbientSounds (void)
 {
        int                     i;
-       float           vol;
+       int                     vol;
        int                     ambient_channel;
        channel_t       *chan;
        unsigned char           ambientlevels[NUM_AMBIENTS];
@@ -844,20 +844,21 @@ void S_UpdateAmbientSounds (void)
                if (chan->sfx == NULL || chan->sfx->fetcher == NULL)
                        continue;
 
-               vol = ambientlevels[ambient_channel];
+               vol = (int)ambientlevels[ambient_channel];
                if (vol < 8)
                        vol = 0;
 
                // Don't adjust volume too fast
+               // FIXME: this rounds off to an int each frame, meaning there is little to no fade at extremely high framerates!
                if (chan->master_vol < vol)
                {
-                       chan->master_vol += host_realframetime * ambient_fade.value;
+                       chan->master_vol += (int)(cl.realframetime * ambient_fade.value);
                        if (chan->master_vol > vol)
                                chan->master_vol = vol;
                }
                else if (chan->master_vol > vol)
                {
-                       chan->master_vol -= host_realframetime * ambient_fade.value;
+                       chan->master_vol -= (int)(cl.realframetime * ambient_fade.value);
                        if (chan->master_vol < vol)
                                chan->master_vol = vol;
                }
@@ -1110,7 +1111,7 @@ void S_Update_(void)
                paintedtime = soundtime;
 
        // mix ahead of current position
-       endtime = soundtime + _snd_mixahead.value * shm->format.speed;
+       endtime = soundtime + (unsigned int)(_snd_mixahead.value * shm->format.speed);
        endtime = min(endtime, (unsigned int)(soundtime + shm->sampleframes));
 
        S_PaintChannels (endtime);