[Scummvm-cvs-logs] SF.net SVN: scummvm:[34440] scummvm/trunk/engines/saga
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Sep 8 10:07:07 CEST 2008
Revision: 34440
http://scummvm.svn.sourceforge.net/scummvm/?rev=34440&view=rev
Author: thebluegr
Date: 2008-09-08 08:07:06 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/saga/rscfile.cpp
scummvm/trunk/engines/saga/sndres.h
Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp 2008-09-08 05:06:43 UTC (rev 34439)
+++ scummvm/trunk/engines/saga/rscfile.cpp 2008-09-08 08:07:06 UTC (rev 34440)
@@ -814,40 +814,14 @@
_vm->_script->_globalVoiceLUT.freeMem();
- switch (chapter) {
- case 1:
- _vm->_sndRes->setVoiceBank(1);
- voiceLUTResourceID = 23;
- break;
- case 2:
- _vm->_sndRes->setVoiceBank(2);
- voiceLUTResourceID = 24;
- break;
- case 3:
- _vm->_sndRes->setVoiceBank(3);
- voiceLUTResourceID = 25;
- break;
- case 4:
- _vm->_sndRes->setVoiceBank(4);
- voiceLUTResourceID = 26;
- break;
- case 5:
- _vm->_sndRes->setVoiceBank(5);
- voiceLUTResourceID = 27;
- break;
- case 6:
- _vm->_sndRes->setVoiceBank(6);
- voiceLUTResourceID = 28;
- break;
- case 7:
+ if (chapter != 7) {
+ int voiceBank = (chapter == 8) ? 0 : chapter;
+ _vm->_sndRes->setVoiceBank(voiceBank);
+ voiceLUTResourceID = 22 + voiceBank;
+ } else {
// IHNM demo
_vm->_sndRes->setVoiceBank(0);
voiceLUTResourceID = 17;
- break;
- case 8:
- _vm->_sndRes->setVoiceBank(0);
- voiceLUTResourceID = 22;
- break;
}
if (voiceLUTResourceID) {
Modified: scummvm/trunk/engines/saga/sndres.h
===================================================================
--- scummvm/trunk/engines/saga/sndres.h 2008-09-08 05:06:43 UTC (rev 34439)
+++ scummvm/trunk/engines/saga/sndres.h 2008-09-08 08:07:06 UTC (rev 34440)
@@ -39,7 +39,6 @@
SndRes(SagaEngine *vm);
~SndRes();
- int loadSound(uint32 resourceId);
void playSound(uint32 resourceId, int volume, bool loop);
void playVoice(uint32 resourceId);
int getVoiceLength(uint32 resourceId);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list