aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2008-04-05 14:28:24 +0000
committerFilippos Karapetis2008-04-05 14:28:24 +0000
commit44ba7f97a96a7c20e71c5003357f4f6e02894831 (patch)
tree5259cfd4b9975892679455e0af17a398889c92f6
parentc8061850ed9a823c8f3fe1592c00a36a21d190d9 (diff)
downloadscummvm-rg350-44ba7f97a96a7c20e71c5003357f4f6e02894831.tar.gz
scummvm-rg350-44ba7f97a96a7c20e71c5003357f4f6e02894831.tar.bz2
scummvm-rg350-44ba7f97a96a7c20e71c5003357f4f6e02894831.zip
Fixed regression from previous commit
svn-id: r31410
-rw-r--r--engines/saga/sndres.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index 2a5c319140..fd1d09038e 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -186,20 +186,16 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
if (_vm->getGameType() == GType_IHNM && _vm->isMacResources()) {
Common::File soundFile;
char soundFileName[40];
- int dirIndex = 0;
+ int dirIndex = floor((float)(resourceId / 64));
if ((context->fileType & GAME_VOICEFILE) != 0) {
- dirIndex = floor((float)(resourceId / 64));
-
if (_voiceSerial == 0) {
sprintf(soundFileName, "Voices/VoicesS/Voices%d/VoicesS%03x", dirIndex, resourceId);
} else {
sprintf(soundFileName, "Voices/Voices%d/Voices%d/Voices%d%03x", _voiceSerial, dirIndex, _voiceSerial, resourceId);
}
} else {
- dirIndex = floor((float)(resourceId / 64));
-
- sprintf(soundFileName, "SFX/SFX%d/SFX%02x", dirIndex, resourceId);
+ sprintf(soundFileName, "SFX/SFX%d/SFX%03x", dirIndex, resourceId);
}
soundFile.open(soundFileName);
soundResourceLength = soundFile.size();