mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:53:52 +00:00
Code Issues Releases Wiki Activity

Merge commit 'upstream/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-20 09:42:14 +02:00
commit de6e8b4cad
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwsound/soundmanager.cpp
View file

@ -100,6 +100,19 @@ namespace MWSound
dir = soundDir + "/"; dir = soundDir + "/";
} }
// Convert a Morrowind sound path (eg. Fx\funny.wav) to full path
// with proper slash conversion (eg. datadir/Sound/Fx/funny.wav)
std::string convertPath(const std::string &str)
{
std::string file = dir + str;
#ifndef WIN32
// Actually / path separators should work in Windows too, they
// just aren't necessary.
std::replace(file.begin(), file.end(), '\\', '/');
#endif
return file;
}
// Convert a soundId to file name, and modify the volume // Convert a soundId to file name, and modify the volume
// according to the sounds local volume setting, minRange and // according to the sounds local volume setting, minRange and
// maxRange. // maxRange.
@ -113,9 +126,7 @@ namespace MWSound
// These factors are not very fine tuned. // These factors are not very fine tuned.
min = snd->data.minRange * 7; min = snd->data.minRange * 7;
max = snd->data.maxRange * 2000; max = snd->data.maxRange * 2000;
std::string file = dir + snd->sound; return convertPath(snd->sound);
std::replace(file.begin(), file.end(), '\\', '/');
return file;
} }
// Add a sound to the list and play it // Add a sound to the list and play it
@ -266,7 +277,7 @@ namespace MWSound
{ {
// The range values are not tested // The range values are not tested
if(!mData) return; if(!mData) return;
mData->add(filename, ptr, "_say_sound", 1, 1, 100, 10000, false); mData->add(mData->convertPath(filename), ptr, "_say_sound", 1, 1, 100, 10000, false);
} }
bool SoundManager::sayDone (MWWorld::Ptr ptr) const bool SoundManager::sayDone (MWWorld::Ptr ptr) const