zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extend S_UpgradeFormat so that "filename.ext" first searches for "filename_ext.flac" and "filename_ext.ogg" before "filename.flac" and "filename.ogg".

Browse source 
This fixes DUKETEAM playing grabbag.ogg instead of grabbag_voc.ogg when Megaton paths have been detected.

git-svn-id: https://svn.eduke32.com/eduke32@5251 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-05-27 08:46:12 +00:00
parent 25543b521b
commit 62d36cede8
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
polymer/eduke32/source/common.c
View file

@ -1078,10 +1078,14 @@ int32_t S_UpgradeFormat(const char *fn, char searchfirst)
Bstrcpy(testfn, fn); Bstrcpy(testfn, fn);
extension = Bstrrchr(testfn, '.'); extension = Bstrrchr(testfn, '.');
if (extension) if (extension != NULL)
{ {
char * const fn_end = Bstrrchr(testfn, '\0');
*extension = '_';
#ifdef HAVE_FLAC #ifdef HAVE_FLAC
Bstrcpy(extension, ".flac"); char const * const extFLAC = ".flac";
Bstrcpy(fn_end, extFLAC);
fp = kopen4loadfrommod(testfn, searchfirst); fp = kopen4loadfrommod(testfn, searchfirst);
if (fp >= 0) if (fp >= 0)
{ {
@ -1091,7 +1095,28 @@ int32_t S_UpgradeFormat(const char *fn, char searchfirst)
#endif #endif
#ifdef HAVE_VORBIS #ifdef HAVE_VORBIS
Bstrcpy(extension, ".ogg"); char const * const extOGG = ".ogg";
Bstrcpy(fn_end, extOGG);
fp = kopen4loadfrommod(testfn, searchfirst);
if (fp >= 0)
{
Bfree(testfn);
return fp;
}
#endif
#ifdef HAVE_FLAC
Bstrcpy(extension, extFLAC);
fp = kopen4loadfrommod(testfn, searchfirst);
if (fp >= 0)
{
Bfree(testfn);
return fp;
}
#endif
#ifdef HAVE_VORBIS
Bstrcpy(extension, extOGG);
fp = kopen4loadfrommod(testfn, searchfirst); fp = kopen4loadfrommod(testfn, searchfirst);
if (fp >= 0) if (fp >= 0)
{ {