mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-15 08:51:24 +00:00
- For World Tour allow falling back on the classic sounds if the Oggs cannot be found
This commit is contained in:
parent
cddd5d3a4c
commit
19b5e2464e
2 changed files with 9 additions and 0 deletions
|
@ -181,6 +181,14 @@ int S_DefineSound(unsigned index, const char *filename, int minpitch, int maxpit
|
||||||
fn.Substitute("\\\\", "\\");
|
fn.Substitute("\\\\", "\\");
|
||||||
FixPathSeperator(fn);
|
FixPathSeperator(fn);
|
||||||
sfx->lumpnum = S_LookupSound(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[kPitchStart] = clamp(minpitch, INT16_MIN, INT16_MAX);
|
||||||
sndinf[kPitchEnd] = clamp(maxpitch, INT16_MIN, INT16_MAX);
|
sndinf[kPitchEnd] = clamp(maxpitch, INT16_MIN, INT16_MAX);
|
||||||
sndinf[kPriority] = priority & 255;
|
sndinf[kPriority] = priority & 255;
|
||||||
|
|
|
@ -675,6 +675,7 @@ Timidity++,ADVSNDMNU_TIMIDITY,,,,,,,,,,,,,,,,,,,,,,
|
||||||
Sound enabled,SNDMNU_SNDENABLED,,,,,Sound aktiv,,,,,,,,,,,,,,,,,
|
Sound enabled,SNDMNU_SNDENABLED,,,,,Sound aktiv,,,,,,,,,,,,,,,,,
|
||||||
Music enabled,SNDMNU_MUSENABLED,,,,,Musik aktiv,,,,,,,,,,,,,,,,,
|
Music enabled,SNDMNU_MUSENABLED,,,,,Musik aktiv,,,,,,,,,,,,,,,,,
|
||||||
CD Music Emulation,SNDMNU_CDEMU,,,,,CD-Musik-Emulation,,,,,,,,,,,,,,,,,
|
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,,,,,,,,,,,,,,,,,
|
Play original MIDI music,SNDMNU_WTMUSIC,,,,,Original-MIDI-Musik spielen,,,,,,,,,,,,,,,,,
|
||||||
Sound Ambience,SNDMNU_AMBIENCE,,,,,Umgebungsgeräusche,,,,,,,,,,,,,,,,,
|
Sound Ambience,SNDMNU_AMBIENCE,,,,,Umgebungsgeräusche,,,,,,,,,,,,,,,,,
|
||||||
"Player Speech
|
"Player Speech
|
||||||
|
|
|
Loading…
Reference in a new issue