[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.5,1.6 sound.h,1.4,1.5 string.cpp,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Fri Sep 13 05:00:04 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv11137/scumm

Modified Files:
	sound.cpp sound.h string.cpp 
Log Message:
patch #608226 (Sam & Max sound fix)

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sound.cpp	11 Sep 2002 13:28:34 -0000	1.5
+++ sound.cpp	13 Sep 2002 11:59:42 -0000	1.6
@@ -382,10 +382,11 @@
 	bool b, finished;
 
 	if (_talk_sound_mode != 0) {
-		if (_talk_sound_mode == 2)
-			_talkChannel = startTalkSound(_talk_sound_a, _talk_sound_b, _talk_sound_mode);
-		else
-			startTalkSound(_talk_sound_a, _talk_sound_b, _talk_sound_mode);
+		if (_talk_sound_mode & 1)
+
+			startTalkSound(_talk_sound_a1, _talk_sound_b1, 1);
+		if (_talk_sound_mode & 2)
+			_talkChannel = startTalkSound(_talk_sound_a2, _talk_sound_b2, 2);
 		_talk_sound_mode = 0;
 	}
 
@@ -623,10 +624,16 @@
 }
 
 void Sound::talkSound(uint32 a, uint32 b, int mode, int frame) {
-	_talk_sound_a = a;
-	_talk_sound_b = b;
-	_talk_sound_mode = mode;
+	if (mode == 1) {
+		_talk_sound_a1 = a;
+		_talk_sound_b1 = b;
+	} else {
+		_talk_sound_a2 = a;
+		_talk_sound_b2 = b;
+	}
+
 	_talk_sound_frame = frame;
+	_talk_sound_mode |= mode;
 }
 
 /* The sound code currently only supports General Midi.

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound.h	11 Sep 2002 13:28:34 -0000	1.4
+++ sound.h	13 Sep 2002 11:59:43 -0000	1.5
@@ -54,7 +54,7 @@
 
 	int _talkChannel;	/* Mixer channel actor is talking on */
 	File *_sfxFile;
-	uint32 _talk_sound_a, _talk_sound_b;
+	uint32 _talk_sound_a1, _talk_sound_a2, _talk_sound_b1, _talk_sound_b2;
 	byte _talk_sound_mode;
 	int _talk_sound_frame;
 	bool _mouthSyncMode;

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- string.cpp	11 Sep 2002 13:28:34 -0000	1.10
+++ string.cpp	13 Sep 2002 11:59:43 -0000	1.11
@@ -294,7 +294,6 @@
 	}
 
 	if (a && !string[0].no_talk_anim) {
-//		a->startAnimActor(a->talkFrame1);
 		has_anim = true;
 		_useTalkAnims = true;
 	}





More information about the Scummvm-git-logs mailing list