mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 04:41:23 +00:00
Fix compiler warnings.
This commit is contained in:
parent
d072dd2725
commit
02597e0bf9
1 changed files with 5 additions and 3 deletions
|
@ -246,6 +246,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
|
||||||
{
|
{
|
||||||
void *lump;
|
void *lump;
|
||||||
Mix_Chunk *chunk;
|
Mix_Chunk *chunk;
|
||||||
|
SDL_RWops *rw;
|
||||||
#ifdef HAVE_LIBGME
|
#ifdef HAVE_LIBGME
|
||||||
Music_Emu *emu;
|
Music_Emu *emu;
|
||||||
gme_info_t *info;
|
gme_info_t *info;
|
||||||
|
@ -387,10 +388,10 @@ void *I_GetSfx(sfxinfo_t *sfx)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Try to load it as a WAVE or OGG using Mixer.
|
// Try to load it as a WAVE or OGG using Mixer.
|
||||||
SDL_RWops *rw = SDL_RWFromMem(lump, sfx->length);
|
rw = SDL_RWFromMem(lump, sfx->length);
|
||||||
if (rw != NULL)
|
if (rw != NULL)
|
||||||
{
|
{
|
||||||
Mix_Chunk *chunk = Mix_LoadWAV_RW(rw, 1);
|
chunk = Mix_LoadWAV_RW(rw, 1);
|
||||||
SDL_RWclose(rw);
|
SDL_RWclose(rw);
|
||||||
return chunk;
|
return chunk;
|
||||||
}
|
}
|
||||||
|
@ -547,6 +548,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
|
||||||
char *data;
|
char *data;
|
||||||
size_t len;
|
size_t len;
|
||||||
lumpnum_t lumpnum = W_CheckNumForName(va("O_%s",musicname));
|
lumpnum_t lumpnum = W_CheckNumForName(va("O_%s",musicname));
|
||||||
|
SDL_RWops *rw;
|
||||||
|
|
||||||
I_Assert(!music);
|
I_Assert(!music);
|
||||||
#ifdef HAVE_LIBGME
|
#ifdef HAVE_LIBGME
|
||||||
|
@ -658,7 +660,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SDL_RWops *rw = SDL_RWFromMem(data, len);
|
rw = SDL_RWFromMem(data, len);
|
||||||
if (rw != NULL)
|
if (rw != NULL)
|
||||||
{
|
{
|
||||||
music = Mix_LoadMUS_RW(rw, SDL_FALSE);
|
music = Mix_LoadMUS_RW(rw, SDL_FALSE);
|
||||||
|
|
Loading…
Reference in a new issue