[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.394,1.395 sound_he.cpp,2.5,2.6

kirben kirben at users.sourceforge.net
Thu Jan 5 01:28:01 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1704/scumm

Modified Files:
	actor.cpp sound_he.cpp 
Log Message:

Revert, might be HE100 only.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -d -r1.394 -r1.395
--- actor.cpp	5 Jan 2006 08:19:14 -0000	1.394
+++ actor.cpp	5 Jan 2006 09:27:02 -0000	1.395
@@ -1563,7 +1563,7 @@
 
 	if (_vm->_heversion >= 71 && _vm->getTalkingActor() == _number) {
 		if (_vm->_heversion <= 95 || (_vm->_heversion >= 98 && _vm->VAR(_vm->VAR_SKIP_RESET_TALK_ACTOR) == 0)) {
-			_vm->setTalkingActor(0);
+			//_vm->setTalkingActor(0);
 		}
 	}
 }

Index: sound_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound_he.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- sound_he.cpp	5 Jan 2006 09:02:41 -0000	2.5
+++ sound_he.cpp	5 Jan 2006 09:27:02 -0000	2.6
@@ -439,7 +439,8 @@
 			_overrideFreq = 0;
 		}
 
-		if ((heFlags & 1) || (heFlags & 4)) {
+		// Bit 3 is looping related too
+		if ((heFlags & 1)) {
 			flags |= Audio::Mixer::FLAG_LOOP;
 		}
 





More information about the Scummvm-git-logs mailing list