X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=snd_mem.c;h=519ef0e27924a3049b533a8c6ee33ed64208161e;hb=d192fabc74fe10ad9f173418e765b189278a1075;hp=482b7709493552d0e6c1f0fdeff86a17479df878;hpb=ac8080688588aba1ab7934f7ba0c2ffea0c8eb91;p=xonotic%2Fdarkplaces.git diff --git a/snd_mem.c b/snd_mem.c index 482b7709..519ef0e2 100644 --- a/snd_mem.c +++ b/snd_mem.c @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "quakedef.h" +#include "darkplaces.h" #include "snd_main.h" #include "snd_ogg.h" @@ -27,7 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef USEXMP #include "snd_xmp.h" #endif +#include "sound.h" +void SCR_PushLoadingScreen (const char *, float); +void SCR_PopLoadingScreen (qbool); /* ==================== @@ -81,7 +84,7 @@ snd_ringbuffer_t *Snd_CreateRingBuffer (const snd_format_t* format, unsigned int S_LoadSound ============== */ -qboolean S_LoadSound (sfx_t *sfx, qboolean complain) +qbool S_LoadSound (sfx_t *sfx, qbool complain) { char namebuffer[MAX_QPATH + 16]; size_t len; @@ -160,7 +163,7 @@ qboolean S_LoadSound (sfx_t *sfx, qboolean complain) // Can't load the sound! sfx->flags |= SFXFLAG_FILEMISSING; if (complain) - Con_DPrintf("failed to load sound \"%s\"\n", sfx->name); + Con_Printf(CON_ERROR "Failed to load sound \"%s\"\n", sfx->name); SCR_PopLoadingScreen(false); return false;