mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-06-08 17:42:05 +00:00
Code Issues Releases Wiki Activity

More linux file name case issues...

Browse source
This commit is contained in:
fgenesis 2012-06-14 18:55:30 +02:00
parent 8f2279e28a
commit 647832ed5b
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BBGE/SoundManager.cpp
View file

@ -925,15 +925,13 @@ bool SoundManager::playVoice(const std::string &name, SoundVoiceType svt, float
if (!voicePath2.empty()) if (!voicePath2.empty())
{ {
fn = voicePath2 + name + fileType; fn = core->adjustFilenameCase(voicePath2 + name + fileType);
stringToLower(fn);
if (exists(fn)) checkOther = false; if (exists(fn)) checkOther = false;
} }
if (checkOther) if (checkOther)
{ {
fn = voicePath + name + fileType; fn = core->adjustFilenameCase(voicePath + name + fileType);
stringToLower(fn);
if (!exists(fn)) if (!exists(fn))
{ {
debugLog("Could not find voice file [" + fn + "]"); debugLog("Could not find voice file [" + fn + "]");
@ -1281,27 +1279,25 @@ bool SoundManager::playMusic(const std::string &name, SoundLoopType slt, SoundFa
if (!name.empty() && name[0] == '.') if (!name.empty() && name[0] == '.')
{ {
fn = name; fn = name;
stringToLower(fn);
} }
else else
{ {
if (!audioPath2.empty()) if (!audioPath2.empty())
{ {
fn = audioPath2 + name + fileType; fn = audioPath2 + name + fileType;
stringToLower(fn);
if (!exists(fn)) if (!exists(fn))
{ {
fn = musicPath + name + fileType; fn = musicPath + name + fileType;
stringToLower(fn);
} }
} }
else else
{ {
fn = musicPath + name + fileType; fn = musicPath + name + fileType;
stringToLower(fn);
} }
} }
fn = core->adjustFilenameCase(fn);
lastMusic = name; lastMusic = name;
stringToLower(lastMusic); stringToLower(lastMusic);