libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 18:02:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Muddled ifs

Browse Source 
svn-id: r17373
This commit is contained in:
Travis Howell 2005-04-04 11:47:38 +00:00
parent f230fe65e8
commit 74c124628a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/intern.h
View File

@ -805,7 +805,7 @@ protected:
void o72_captureWizImage();
void o72_getTimer();
void o72_setTimer();
void o72_getSoundElapsedTimeOfSound();
void o72_getSoundElapsedTime();
void o72_startScript();
void o72_startObject();
void o72_drawObject();

2
scumm/script_v80he.cpp
View File

@ -153,7 +153,7 @@ void ScummEngine_v80he::setupOpcodes() {
/* 58 */
OPCODE(o72_getTimer),
OPCODE(o72_setTimer),
OPCODE(o72_getSoundElapsedTimeOfSound),
OPCODE(o72_getSoundElapsedTime),
OPCODE(o6_wordArrayDec),
/* 5C */
OPCODE(o6_if),

4
scumm/sound.cpp
View File

@ -792,9 +792,9 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, SoundHandle *handl
void Sound::stopTalkSound() {
if (_sfxMode & 2) {
if (_vm->_imuseDigital) {
_vm->_mixer->stopID(kTalkSoundID);
_vm->_imuseDigital->stopSound(kTalkSoundID);
} else if (_vm->_heversion >= 70) {
_vm->_imuseDigital->stopSound(1);
_vm->_mixer->stopID(1);
} else {
_vm->_mixer->stopHandle(_talkChannelHandle);
}