mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-20 08:48:13 +00:00
Fixed regression from previous commit
svn-id: r31410
This commit is contained in:
parent
c8061850ed
commit
44ba7f97a9
@ -186,20 +186,16 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
|
|||||||
if (_vm->getGameType() == GType_IHNM && _vm->isMacResources()) {
|
if (_vm->getGameType() == GType_IHNM && _vm->isMacResources()) {
|
||||||
Common::File soundFile;
|
Common::File soundFile;
|
||||||
char soundFileName[40];
|
char soundFileName[40];
|
||||||
int dirIndex = 0;
|
int dirIndex = floor((float)(resourceId / 64));
|
||||||
|
|
||||||
if ((context->fileType & GAME_VOICEFILE) != 0) {
|
if ((context->fileType & GAME_VOICEFILE) != 0) {
|
||||||
dirIndex = floor((float)(resourceId / 64));
|
|
||||||
|
|
||||||
if (_voiceSerial == 0) {
|
if (_voiceSerial == 0) {
|
||||||
sprintf(soundFileName, "Voices/VoicesS/Voices%d/VoicesS%03x", dirIndex, resourceId);
|
sprintf(soundFileName, "Voices/VoicesS/Voices%d/VoicesS%03x", dirIndex, resourceId);
|
||||||
} else {
|
} else {
|
||||||
sprintf(soundFileName, "Voices/Voices%d/Voices%d/Voices%d%03x", _voiceSerial, dirIndex, _voiceSerial, resourceId);
|
sprintf(soundFileName, "Voices/Voices%d/Voices%d/Voices%d%03x", _voiceSerial, dirIndex, _voiceSerial, resourceId);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
dirIndex = floor((float)(resourceId / 64));
|
sprintf(soundFileName, "SFX/SFX%d/SFX%03x", dirIndex, resourceId);
|
||||||
|
|
||||||
sprintf(soundFileName, "SFX/SFX%d/SFX%02x", dirIndex, resourceId);
|
|
||||||
}
|
}
|
||||||
soundFile.open(soundFileName);
|
soundFile.open(soundFileName);
|
||||||
soundResourceLength = soundFile.size();
|
soundResourceLength = soundFile.size();
|
||||||
|
Loading…
Reference in New Issue
Block a user