aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-08-21 20:05:29 +0200
committerEugene Sandulenko2019-09-03 17:17:35 +0200
commit43f39b30de51ffc7d357322eac0f7b9b93a08498 (patch)
tree8f79adf4e4e82af7f559b2226cbff043cf04d108
parentd1ef6fc0082c76993fa6288f2564c845ae35a7b3 (diff)
downloadscummvm-rg350-43f39b30de51ffc7d357322eac0f7b9b93a08498.tar.gz
scummvm-rg350-43f39b30de51ffc7d357322eac0f7b9b93a08498.tar.bz2
scummvm-rg350-43f39b30de51ffc7d357322eac0f7b9b93a08498.zip
HDB: FUrther simplification of sound code
-rw-r--r--engines/hdb/sound.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/hdb/sound.cpp b/engines/hdb/sound.cpp
index 2d260bf976..85e20f0036 100644
--- a/engines/hdb/sound.cpp
+++ b/engines/hdb/sound.cpp
@@ -1636,13 +1636,11 @@ void Sound::playVoice(int index, int actor) {
return;
Common::SeekableReadStream *stream = nullptr;
- if (g_hdb->getPlatform() == Common::kPlatformLinux) {
- Common::String updatedName(soundList[index].name);
+ Common::String updatedName(soundList[index].name);
+ if (g_hdb->getPlatform() == Common::kPlatformLinux)
updatedName.replace(updatedName.begin() + updatedName.size() - 4, updatedName.end(), "_OGG");
- stream = g_hdb->_fileMan->findFirstData(updatedName.c_str(), TYPE_BINARY);
- } else
- stream = g_hdb->_fileMan->findFirstData(soundList[index].name, TYPE_BINARY);
+ stream = g_hdb->_fileMan->findFirstData(updatedName.c_str(), TYPE_BINARY);
if (stream == nullptr)
return;