[Scummvm-cvs-logs] SF.net SVN: scummvm: [21195] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 21195
Author:   kirben
Date:     2006-03-09 22:05:49 -0800 (Thu, 09 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21195&view=rev

Log Message:
-----------
Adjust talk sound check in CHARSET_1(), since processSfxQueues() doesn't exist in HE games. Fixes glitch when time machine is used in putttime.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp
    scummvm/trunk/engines/scumm/sound.cpp
    scummvm/trunk/engines/scumm/string.cpp
Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2006-03-10 03:46:58 UTC (rev 21194)
+++ scummvm/trunk/engines/scumm/actor.cpp	2006-03-10 06:05:49 UTC (rev 21195)
@@ -1568,7 +1568,7 @@
 
 	if (_vm->_game.heversion >= 71 && _vm->getTalkingActor() == _number) {
 		if (_vm->_game.heversion <= 95 || (_vm->_game.heversion >= 98 && _vm->VAR(_vm->VAR_SKIP_RESET_TALK_ACTOR) == 0)) {
-			//_vm->setTalkingActor(0);
+			_vm->setTalkingActor(0);
 		}
 	}
 }

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2006-03-10 03:46:58 UTC (rev 21194)
+++ scummvm/trunk/engines/scumm/sound.cpp	2006-03-10 06:05:49 UTC (rev 21195)
@@ -132,7 +132,6 @@
 void Sound::processSound() {
 	if (_vm->_game.heversion >= 60) {
 		processSoundQueues();
-		processSfxQueues();
 	} else {
 		processSfxQueues();
 

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2006-03-10 03:46:58 UTC (rev 21194)
+++ scummvm/trunk/engines/scumm/string.cpp	2006-03-10 06:05:49 UTC (rev 21195)
@@ -476,8 +476,13 @@
 		return;
 
 	if ((_game.version <= 6 && _haveMsg == 1) || (_game.version == 7 && _haveMsg != 1) || (_game.version == 8 && VAR(VAR_HAVE_MSG))) {
-		if ((_sound->_sfxMode & 2) == 0)
-			stopTalk();
+		if (_game.heversion >= 60) {
+			if (_sound->isSoundRunning(1) == 0)
+				stopTalk();
+		} else {
+			if ((_sound->_sfxMode & 2) == 0)
+				stopTalk();
+		}
 		return;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.