zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added explicit fallback to default soundfont

Browse source 
With no soundfonts found the game crashed on startup
Local UNIX build had the same issue because $PROGDIR/soundfonts is not in search path
This commit is contained in:
alexey.lysiuk 2018-03-03 15:17:30 +02:00
parent 2541bd93fc
commit 8145b52037
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/sound/i_soundfont.cpp
View file

@ -372,6 +372,11 @@ void FSoundFontManager::CollectSoundfonts()
} }
} }
} }
if (soundfonts.Size() == 0)
{
ProcessOneFile(NicePath("$PROGDIR/soundfonts/gzdoom.sf2"));
}
} }
//========================================================================== //==========================================================================

5
src/sound/mididevices/music_fluidsynth_mididevice.cpp
View file

@ -324,10 +324,7 @@ FluidSynthMIDIDevice::FluidSynthMIDIDevice(const char *args)
{ {
return; return;
} }
if (LoadPatchSets(nullptr))
{
return;
}
// The following will only be used if no soundfont at all is provided, i.e. even the standard one coming with GZDoom is missing. // The following will only be used if no soundfont at all is provided, i.e. even the standard one coming with GZDoom is missing.
#ifdef __unix__ #ifdef __unix__
// This is the standard location on Ubuntu. // This is the standard location on Ubuntu.

1
src/version.h
View file

@ -97,7 +97,6 @@ const char *GetVersionString();
#define GAMESIG "GZDOOM" #define GAMESIG "GZDOOM"
#define BASEWAD "gzdoom.pk3" #define BASEWAD "gzdoom.pk3"
#define OPTIONALWAD "zd_extra.pk3" #define OPTIONALWAD "zd_extra.pk3"
#define BASESF "gzdoom.sf2"
// More stuff that needs to be different for derivatives. // More stuff that needs to be different for derivatives.
#define GAMENAME "GZDoom" #define GAMENAME "GZDoom"