From 2049353647993c93a8f7bf5ddd60b17c0365bb71 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 3 Jul 2025 00:34:19 +0200 Subject: [PATCH 1/6] move this out of maptitle condition it does not rely on it and may even fail idk why i threw it in there --- src/s_sound.c | 17 +++++++++-------- src/sounds.c | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index cf75df56a..5577f45de 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2010,7 +2010,7 @@ void S_KeepMusic(void) } // Sets up the map music in case it should be reloaded -// Special case for keep music +// Special case for keepmusic void S_HandleReloadResetMusic(void) { if (!(mapmusic.flags & MUSIC_RELOADRESET)) @@ -2035,23 +2035,24 @@ void S_HandleReloadResetMusic(void) static boolean S_SkipIntroMusic(void) { - boolean skip = cv_skipintromusic.value; + if (!cv_skipintromusic.value) + return false; - if (!skip) + // check if menu music is playing, otherwise it may continue playing + if (!stricmp(music.name, "titles")) return false; char *maptitle = G_BuildMapTitle(gamemap); // Zzz... - if (maptitle) + if (maptitle && !stricmp(maptitle, "Wandering Falls")) // wandering balls changes its song when the race starts Zzz... { - // check if menu music is playing, otherwise it may continue playing - if (!stricmp(music.name, "titles") || (maptitle && (!stricmp(maptitle, "Wandering Falls")))) // wandering balls changes its song when the race starts Zzz... - skip = false; + Z_Free(maptitle); + return false; } Z_Free(maptitle); - return skip; + return true; } // diff --git a/src/sounds.c b/src/sounds.c index c3d92c853..bdfc19b86 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -1037,6 +1037,7 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean S_sfx[i].data = I_GetSfx(&S_sfx[i]); else S_sfx[i].data = NULL; + return i; } } From d4a29f2a44f97ac5baad3999d2983a868b481cf3 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 16 Nov 2025 17:18:23 +0100 Subject: [PATCH 2/6] this aint testing anymore :3 --- src/doomdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doomdef.h b/src/doomdef.h index cf15d3fa8..055ef3739 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -117,7 +117,7 @@ extern char logfilename[1024]; #define VERSIONSTRING "Saturn v9" #define VERSIONSTRINGW L"Saturn v9" -#define SATURN_TESTING // comment out for saturn release builds! +//#define SATURN_TESTING // comment out for saturn release builds! // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // And change CMakeLists.txt (not src/, but in root), for CMake users! From 5117bf1f857cf03eac9df9f01bc5d4f83f7d3751 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 16 Nov 2025 16:31:23 +0100 Subject: [PATCH 3/6] remove "stun.c" from sourcefile fixes linking on windoze will need to handle this in cmake seperately! --- src/Sourcefile | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Sourcefile b/src/Sourcefile index d50e98b94..761806e6b 100644 --- a/src/Sourcefile +++ b/src/Sourcefile @@ -43,7 +43,6 @@ screen.c sounds.c st_stuff.c string.c -stun.c tables.c v_video.c w_wad.c From 84a3503262f721709e8431f4fb6b4343125f0c14 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 16 Nov 2025 16:54:11 +0100 Subject: [PATCH 4/6] comment out directsound thing somehow this still applied on 32 bit build --- src/sdl/mixer_sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 8330828f8..7434b45d7 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -173,7 +173,7 @@ void I_StartupSound(void) // Force DirectSound instead of WASAPI // SDL 2.0.6+ defaults to the latter and it screws up our sound effects // SDL 2.26.5 brought imrovements to resampling so this just screws up other stuff now - SDL_setenv("SDL_AUDIODRIVER", "directsound", 1); + //SDL_setenv("SDL_AUDIODRIVER", "directsound", 1); #endif // EE inits audio first so we're following along. From 88a9d6c29e24602c58dc849454f42cf6e3a1c4c1 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 16 Nov 2025 20:50:09 +0100 Subject: [PATCH 5/6] Fix dedicated server build forgor about I_HandleControllerHatRepeat fixes https://github.com/Indev450/SRB2Kart-Saturn/issues/212 --- src/dedicated/i_video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dedicated/i_video.c b/src/dedicated/i_video.c index 51bc2c45a..8227233a8 100644 --- a/src/dedicated/i_video.c +++ b/src/dedicated/i_video.c @@ -155,7 +155,10 @@ boolean I_UseNativeKeyboard(void) return false; } +void I_HandleControllerHatRepeat(void) +{ +} + void I_SetBorderlessWindow(void) { - } From 89f450db27fd3172c456d615a52ed82b88c8b321 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 16 Nov 2025 21:47:21 +0100 Subject: [PATCH 6/6] Revert "Simplify intermission timer code" This reverts commit ed16c4fd9ffd3031547871d5709c7da53a69e2c8. --- src/y_inter.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/y_inter.c b/src/y_inter.c index 9abbccbd8..c1bdafd32 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -552,8 +552,18 @@ void Y_Ticker(void) intertic++; - if ((timer && !--timer) - || (intertic == endtic)) + // multiplayer uses timer (based on cv_inttime) + if (timer) + { + if (!--timer) + { + Y_EndIntermission(); + Y_FollowIntermission(); + return; + } + } + // single player is hardcoded to go away after awhile + else if (intertic == endtic) { Y_EndIntermission(); Y_FollowIntermission();