- For World Tour allow falling back on the classic sounds if the Oggs cannot be found

This commit is contained in:
Christoph Oelckers 2020-09-11 21:04:47 +02:00
parent cddd5d3a4c
commit 19b5e2464e
2 changed files with 9 additions and 0 deletions

View file

@ -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;

View file

@ -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

1 default Identifier Remarks Filter eng enc ena enz eni ens enj enb enl ent enw cs de el eo es esm esn esg esc esa esd esv eso esr ess esf esl esy esz esb ese esh esi esu fi fr hu it jp ko nl pl pt ptg ro ru sr
675 Space Suit On Scuba Gear On SPACE SUIT ON SCUBA GEAR ON
676 Ammo For Shrinker Space Suit On AMMO FOR SHRINKER SPACE SUIT ON
677 Buy Major Stryker Ammo For Shrinker BUY MAJOR STRYKER AMMO FOR SHRINKER
678 Buy Major Stryker BUY MAJOR STRYKER
679 Mighty Foot Engaged MIGHTY FOOT ENGAGED
680 Weapon Mode On WEAPON MODE ON
681 Weapon Mode Off WEAPON MODE OFF