Skip to content

Commit bf527ef

Browse files
committed
Merge pull request OpenXcom#1008 from myk002/adlib_fix
Adlib fix
2 parents 5f92580 + a8b7dff commit bf527ef

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/Resource/XcomResourcePack.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ XcomResourcePack::XcomResourcePack(Ruleset *rules) : ResourcePack()
307307

308308
// Load surface sets
309309
std::string sets[] = {"BASEBITS.PCK",
310-
"INTICON.PCK",
311-
"TEXTURE.DAT"};
310+
"INTICON.PCK",
311+
"TEXTURE.DAT"};
312312

313313
for (size_t i = 0; i < sizeof(sets)/sizeof(sets[0]); ++i)
314314
{
@@ -1080,12 +1080,12 @@ bool XcomResourcePack::isImageFile(std::string extension)
10801080
Music *XcomResourcePack::loadMusic(MusicFormat fmt, const std::string &file, int track, float volume, CatFile *adlibcat, CatFile *aintrocat, GMCatFile *gmcat)
10811081
{
10821082
/* MUSIC_AUTO, MUSIC_FLAC, MUSIC_OGG, MUSIC_MP3, MUSIC_MOD, MUSIC_WAV, MUSIC_ADLIB, MUSIC_MIDI */
1083-
static const std::string exts[] = {"", "flac", "ogg", "mp3", "mod", "wav", "", "mid"};
1083+
static const std::string exts[] = {"", ".flac", ".ogg", ".mp3", ".mod", ".wav", "", ".mid"};
10841084
Music *music = 0;
10851085
std::set<std::string> soundContents = FileMap::getVFolderContents("SOUND");
10861086
try
10871087
{
1088-
std::string fname = file + "." + exts[fmt];
1088+
std::string fname = file + exts[fmt];
10891089
std::transform(fname.begin(), fname.end(), fname.begin(), tolower);
10901090

10911091
// Try Adlib music

0 commit comments

Comments
 (0)