[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.39,1.40

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv15414/simon

Modified Files:
	simon.cpp 
Log Message:

Fix voice in simon 1/2 dos talkie again.
Disable code causing movement problems in simon 2 games


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- simon.cpp	31 Oct 2002 01:55:11 -0000	1.39
+++ simon.cpp	31 Oct 2002 09:38:02 -0000	1.40
@@ -2883,9 +2883,10 @@
 	uint x_diff, y_diff;
 	uint best_i = 0, best_j = 0, best_dist = 0xFFFFFFFF;
 
-	if (_game & GAME_SIMON2) {
-		x += _x_scroll * 8;
-	}
+/* Causes movement problems in Simon 2 games, often unable to move left */
+//	if (_game & GAME_SIMON2) {
+//		x += _x_scroll * 8;
+//	}
 
 	prev_i = 21 - _variableArray[12];
 	for (i = 20; i != 0; --i) {
@@ -4812,7 +4813,7 @@
 
 		_mixer->playRaw(&_voice_sound, buffer, data[1], READ_LE_UINT32(&wave_hdr.samples_per_sec),
 										 SoundMixer::FLAG_UNSIGNED);
-	} else if (_voice_type == FORMAT_WAV) {      /* VOC audio */
+	} else if (_voice_type == FORMAT_VOC) {      /* VOC audio */
 		VocHeader voc_hdr;
 		VocBlockHeader voc_block_hdr;
 		uint32 size;