From 19b5e2464e8c189b5b78deabe41ac1f163b86f78 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 11 Sep 2020 21:04:47 +0200 Subject: [PATCH] - For World Tour allow falling back on the classic sounds if the Oggs cannot be found --- source/games/duke/src/sounds.cpp | 8 ++++++++ wadsrc/static/language.csv | 1 + 2 files changed, 9 insertions(+) diff --git a/source/games/duke/src/sounds.cpp b/source/games/duke/src/sounds.cpp index 27fa20aa7..8f105baef 100644 --- a/source/games/duke/src/sounds.cpp +++ b/source/games/duke/src/sounds.cpp @@ -181,6 +181,14 @@ int S_DefineSound(unsigned index, const char *filename, int minpitch, int maxpit fn.Substitute("\\\\", "\\"); FixPathSeperator(fn); sfx->lumpnum = S_LookupSound(fn); + // For World Tour allow falling back on the classic sounds if the Oggs cannot be found + if (isWorldTour() && sfx->lumpnum == -1) + { + fn.ToLower(); + fn.Substitute("sound/", ""); + fn.Substitute(".ogg", ".voc"); + sfx->lumpnum = S_LookupSound(fn); + } sndinf[kPitchStart] = clamp(minpitch, INT16_MIN, INT16_MAX); sndinf[kPitchEnd] = clamp(maxpitch, INT16_MIN, INT16_MAX); sndinf[kPriority] = priority & 255; diff --git a/wadsrc/static/language.csv b/wadsrc/static/language.csv index f134e0100..827fdf996 100644 --- a/wadsrc/static/language.csv +++ b/wadsrc/static/language.csv @@ -675,6 +675,7 @@ Timidity++,ADVSNDMNU_TIMIDITY,,,,,,,,,,,,,,,,,,,,,, Sound enabled,SNDMNU_SNDENABLED,,,,,Sound aktiv,,,,,,,,,,,,,,,,, Music enabled,SNDMNU_MUSENABLED,,,,,Musik aktiv,,,,,,,,,,,,,,,,, CD Music Emulation,SNDMNU_CDEMU,,,,,CD-Musik-Emulation,,,,,,,,,,,,,,,,, +Play original Sounds,SNDMNU_WTSOUND,,,,,Original-Soundeffekte spielen,,,,,,,,,,,,,,,,, Play original MIDI music,SNDMNU_WTMUSIC,,,,,Original-MIDI-Musik spielen,,,,,,,,,,,,,,,,, Sound Ambience,SNDMNU_AMBIENCE,,,,,Umgebungsgeräusche,,,,,,,,,,,,,,,,, "Player Speech