don't load images when running a dedicated server (they would only be discarded by...

[xonotic/darkplaces.git] / snd_mem.c

diff --git a/snd_mem.c b/snd_mem.c
index 281e513a0b222216a6710454dc1e8b94ff0835f3..0eec602f9dbb478ef777ed1370d6b57dc8a48915 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ResampleSfx
 ================
 */
-size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t* in_format, qbyte *out_data, const char* sfxname)
+size_t ResampleSfx (const unsigned char *in_data, size_t in_length, const snd_format_t* in_format, unsigned char *out_data, const char* sfxname)
 {
        size_t srclength, outcount, i;
 
@@ -64,13 +64,13 @@ size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t*
                const unsigned int fracstep = (double)in_format->speed / shm->format.speed * (1 << FRACTIONAL_BITS);
                size_t remain_in = srclength, total_out = 0;
                unsigned int samplefrac;
-               const qbyte *in_ptr = in_data;
-               qbyte *out_ptr = out_data;
+               const unsigned char *in_ptr = in_data;
+               unsigned char *out_ptr = out_data;
 
                // Check that we can handle one second of that sound
                if (in_format->speed * in_format->channels > (1 << INTEGER_BITS))
                {
-                       Con_Printf ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))",
+                       Con_Printf ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))\n",
                                           in_format->speed, in_format->channels);
                        return 0;
                }
@@ -123,12 +123,12 @@ size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t*
                                                // No more value to interpolate with?
                                                if (srcsample + in_format->channels < remain_in)
                                                {
-                                                       a = ((const qbyte*)in_ptr)[srcsample] - 128;
-                                                       b = ((const qbyte*)in_ptr)[srcsample + in_format->channels] - 128;
+                                                       a = ((const unsigned char*)in_ptr)[srcsample] - 128;
+                                                       b = ((const unsigned char*)in_ptr)[srcsample + in_format->channels] - 128;
                                                        *((signed char*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
                                                }
                                                else
-                                                       *((signed char*)out_ptr) = ((const qbyte*)in_ptr)[srcsample] - 128;
+                                                       *((signed char*)out_ptr) = ((const unsigned char*)in_ptr)[srcsample] - 128;
 
                                                out_ptr += sizeof (signed char);
                                        }
@@ -170,7 +170,7 @@ qboolean S_LoadSound (sfx_t *s, qboolean complain)
        if (s->fetcher != NULL)
        {
                if (s->format.speed != shm->format.speed)
-                       Con_Printf ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)", s->name);
+                       Con_Printf ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)\n", s->name);
                return true;
        }
 
@@ -213,20 +213,3 @@ qboolean S_LoadSound (sfx_t *s, qboolean complain)
                Con_Printf("S_LoadSound: Couldn't load \"%s\"\n", s->name);
        return false;
 }
-
-void S_UnloadSound (sfx_t *s)
-{
-       if (s->fetcher != NULL)
-       {
-               unsigned int i;
-
-               // Stop all channels that use this sound
-               for (i = 0; i < total_channels ; i++)
-                       if (channels[i].sfx == s)
-                               S_StopChannel (i);
-
-               s->fetcher = NULL;
-               s->fetcher_data = NULL;
-               Mem_FreePool(&s->mempool);
-       }
-}