From: divverent Date: Sun, 26 Oct 2008 16:10:40 +0000 (+0000) Subject: fix two warnings with statically linked-in libmodplug X-Git-Tag: xonotic-v0.1.0preview~2049 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0689f5b07ead0458d02015b256e16a393340347b;p=xonotic%2Fdarkplaces.git fix two warnings with statically linked-in libmodplug git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8540 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/snd_modplug.c b/snd_modplug.c index 35b255c9..44903fd7 100644 --- a/snd_modplug.c +++ b/snd_modplug.c @@ -256,7 +256,9 @@ static const snd_buffer_t* ModPlug_FetchSound (void *sfxfetcher, void **chfetche return NULL; } +#ifndef SND_MODPLUG_STATIC if(ModPlug_SetMasterVolume) +#endif ModPlug_SetMasterVolume(per_ch->mf, 512); // max volume, DP scales down! per_ch->bs = 0; @@ -466,7 +468,9 @@ qboolean ModPlug_LoadModPlugFile (const char *filename, sfx_t *sfx) return false; } +#ifndef SND_MODPLUG_STATIC if(ModPlug_SetMasterVolume) +#endif ModPlug_SetMasterVolume(mf, 512); // max volume, DP scales down! if (developer_loading.integer >= 2)