[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.162,1.163 simon.h,1.52,1.53 vga.cpp,1.36,1.37

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv12577/simon

Modified Files:
	simon.cpp simon.h vga.cpp 
Log Message:

Remove vc_59_helper
Make t key work in simon2talkie/win only


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- simon.cpp	7 Mar 2003 12:29:27 -0000	1.162
+++ simon.cpp	7 Mar 2003 12:52:27 -0000	1.163
@@ -3098,7 +3098,7 @@
 			break;
 
 		case 't':
-			if (_game & GF_SIMON2)
+			if (_game & GF_SIMON2 && _game & GF_TALKIE)
 				_subtitles ^= 1;
 			break;
 
@@ -3480,10 +3480,6 @@
 
 	dx_unlock_2();
 	_lock_word &= ~0x8000;
-}
-
-bool SimonState::vc_59_helper() {
-	return _sound->_voice_handle == 0;
 }
 
 void SimonState::video_copy_if_flag_0x8_c(FillOrCopyStruct *fcs) {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- simon.h	7 Mar 2003 12:29:33 -0000	1.52
+++ simon.h	7 Mar 2003 12:52:28 -0000	1.53
@@ -689,7 +689,6 @@
 	VgaSprite *find_cur_sprite();
 	void vc_set_bit_to(uint bit, bool value);
 
-	bool vc_59_helper();
 	void expire_vga_timers();
 
 	bool has_vgastruct_with_id(uint16 id, uint16 file);

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- vga.cpp	7 Mar 2003 03:26:30 -0000	1.36
+++ vga.cpp	7 Mar 2003 12:52:28 -0000	1.37
@@ -1582,7 +1582,7 @@
 			vc_kill_thread(file, start);
 		} while (++start != end);
 	} else {
-		if (vc_59_helper())
+		if (_sound->_voice_handle == 0)
 			vc_skip_next_instruction();
 	}
 }
@@ -1760,7 +1760,7 @@
 
 void SimonState::vc_64_skip_if_text() {
 	// Simon2
-	if (vc_59_helper())
+	if (_sound->_voice_handle == 0)
 		vc_skip_next_instruction();
 }