stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-29 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compile fixes

Browse source
This commit is contained in:
mazmazz 2018-09-14 10:58:41 -04:00
parent fac7d19637
commit 4b1bc53db1
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/d_main.c
View file

@ -121,20 +121,17 @@ INT32 postimgparam;
postimg_t postimgtype2 = postimg_none; postimg_t postimgtype2 = postimg_none;
INT32 postimgparam2; INT32 postimgparam2;
// These variables are only true if
// whether the respective sound system is disabled
// or they're init'ed, but the player just toggled them
#ifdef _XBOX #ifdef _XBOX
boolean midi_disabled = true, sound_disabled = true; boolean midi_disabled = true, sound_disabled = true;
boolean digital_disabled = true; boolean digital_disabled = true;
#else #else
boolean midi_disabled = false, sound_disabled = false;
boolean digital_disabled = false; // No fmod-based music
#endif
// These variables are only true if
// whether the respective sound system is disabled
// or they're init'ed, but the player just toggled them
boolean midi_disabled = false; boolean midi_disabled = false;
boolean sound_disabled = false; boolean sound_disabled = false;
boolean digital_disabled = false; boolean digital_disabled = false;
#endif
boolean advancedemo; boolean advancedemo;
#ifdef DEBUGFILE #ifdef DEBUGFILE

2
src/s_sound.c
View file

@ -1378,7 +1378,7 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping)
return; return;
} }
if (strnicmp(music_name, newmusic, 6)) if (strnicmp(music_name, mmusic, 6))
{ {
S_StopMusic(); // shutdown old music S_StopMusic(); // shutdown old music

4
src/sdl/i_video.c
View file

@ -566,7 +566,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
// Tell game we got focus back, resume music if necessary // Tell game we got focus back, resume music if necessary
window_notinfocus = false; window_notinfocus = false;
if (!paused) if (!paused)
I_ResumeSong(0); //resume it I_ResumeSong(); //resume it
if (!firsttimeonmouse) if (!firsttimeonmouse)
{ {
@ -578,7 +578,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
{ {
// Tell game we lost focus, pause music // Tell game we lost focus, pause music
window_notinfocus = true; window_notinfocus = true;
I_PauseSong(0); I_PauseSong();
if (!disable_mouse) if (!disable_mouse)
{ {