[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.69,1.70 simon.cpp,1.196,1.197 simon.h,1.63,1.64 vga.cpp,1.48,1.49

[Jamieson Christian]

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

Modified Files:
	items.cpp simon.cpp simon.h vga.cpp 
Log Message:
Renamed opcodes whose functions are now known.
Cleaned up unused script variables.
Miscellaneous semantic changes.

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- items.cpp	21 May 2003 04:36:09 -0000	1.69
+++ items.cpp	21 May 2003 05:12:03 -0000	1.70
@@ -698,7 +698,7 @@
 			break;
 
 		case 127:{									/* deals with music */
-				o_unk_127();
+				o_play_music_resource();
 			}
 			break;
 
@@ -750,10 +750,8 @@
 			break;
 
 		case 134:{
-				_vc70_var2 = -1;
 				midi.stop();
 				_last_music_played = -1;
-				_vc72_var1 = -1;
 			}
 			break;
 
@@ -1431,7 +1429,7 @@
 	video_putchar(fcs, 8);
 }
 
-void SimonState::o_unk_127() {
+void SimonState::o_play_music_resource() {
 	int music = getVarOrWord();
 	int track = getVarOrWord();
 
@@ -1446,32 +1444,18 @@
 	if (_game & GF_SIMON2) {
 		int loop = getVarOrByte();
 
-		if (_debugMode)
-			debug (0, "o_unk_127 (%d, %d, %d): Load/play music resource", music, track, loop);
-
 		midi.setLoop (loop != 0);
-
 		if (_last_music_played != music) {
-			playMusic (music);
+			loadMusic (music);
 			_last_music_played = music;
 			_next_music_to_play = -1;
-			_vc72_var1 = _vc72_var2 = _vc72_var3 = -1;
 		}
-
-		if (track == _vc72_var1 || track == 999)
-			return;
-
-		_vc72_var1 = track;
-		_vc70_var1 = -1;
-		_vc70_var2 = -1;
-		_vc72_var2 = -1;
-		_vc72_var3 = -1;
-		midi_play (track);
+		midi.jump (track, 0);
 	} else {
 		if (music != _last_music_played) {
 			_last_music_played = music;
-			playMusic (music);
-			midi_play (track);
+			loadMusic (music);
+			midi.jump (track, 0);
 		}
 	}
 }

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- simon.cpp	21 May 2003 00:44:37 -0000	1.196
+++ simon.cpp	21 May 2003 05:12:04 -0000	1.197
@@ -256,11 +256,6 @@
 	_vga_var5 = 0;
 	_vga_var8 = 0;
 
-	_vc72_var1 = 0;
-	_vc72_var2 = 0;
-	_vc72_var3 = 0;
-	_vc70_var1 = 0;
-	_vc70_var2 = 0;
 	_vga_var7 = 0;
 
 	_script_cond_a = 0;
@@ -3327,7 +3322,7 @@
 				if (midi._midi_sfx_toggle)
 					midi.stop();
 				else
-					playMusic(_last_music_played);
+					loadMusic(_last_music_played);
 			} else
 				_sound->effectsPause(_effects_paused ^= 1);
 			break;
@@ -5277,14 +5272,7 @@
 	return true;
 }
 
-void SimonState::midi_play (uint track) {
-	if (track == 999)
-		return;
-	midi.jump (track, 0);
-}
-
-
-void SimonState::playMusic (uint music) {
+void SimonState::loadMusic (uint music) {
 	if (midi._midi_sfx_toggle)
 		return;
 
@@ -5298,9 +5286,6 @@
 		}
 
 		_last_music_played = music;
-		_vc72_var1 = 999;
-		_vc70_var1 = -1;
-		_vc72_var3 = -1;
 		_next_music_to_play = -1;
 	} else { // Simon 1 music
 		if (_game & GF_AMIGAS) {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- simon.h	20 May 2003 16:24:31 -0000	1.63
+++ simon.h	21 May 2003 05:12:04 -0000	1.64
@@ -198,8 +198,6 @@
 	int _x_scroll, _vga_var1, _vga_var2, _vga_var3, _vga_var5;
 	byte _vga_var8;
 
-	int16 _vc72_var1, _vc72_var2, _vc72_var3;
-	int16 _vc70_var1, _vc70_var2;
 	byte *_vga_var7;
 
 	int16 _script_cond_a, _script_cond_b, _script_cond_c;
@@ -468,7 +466,7 @@
 	void skip_speech();
 	void o_unk_120(uint a);
 	void o_unk_126();
-	void o_unk_127();
+	void o_play_music_resource();
 	void o_save_game();
 	void o_load_game();
 	void o_quit_if_user_presses_y();
@@ -670,10 +668,10 @@
 	void vc_66_skip_if_nz();
 	void vc_67_skip_if_ge();
 	void vc_68_skip_if_le();
-	void vc_69();
-	void vc_70();
-	void vc_71();
-	void vc_72();
+	void vc_69_play_track();
+	void vc_70_queue_music();
+	void vc_71_check_music_queue();
+	void vc_72_play_track_2();
 	void vc_73_set_op189_flag();
 	void vc_74_clear_op189_flag();
 
@@ -768,8 +766,7 @@
 	void video_putchar_newline(FillOrCopyStruct *fcs);
 	void video_putchar_drawchar(FillOrCopyStruct *fcs, uint x, uint y, byte chr);
 
-	void midi_play(uint music);
-	void playMusic(uint music);
+	void loadMusic(uint music);
 	void checkTimerCallback();
 	void delay(uint delay);
 

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- vga.cpp	21 May 2003 04:36:09 -0000	1.48
+++ vga.cpp	21 May 2003 05:12:04 -0000	1.49
@@ -99,10 +99,10 @@
 	&SimonState::vc_66_skip_if_nz,
 	&SimonState::vc_67_skip_if_ge,
 	&SimonState::vc_68_skip_if_le,
-	&SimonState::vc_69,
-	&SimonState::vc_70,
-	&SimonState::vc_71,
-	&SimonState::vc_72,
+	&SimonState::vc_69_play_track,
+	&SimonState::vc_70_queue_music,
+	&SimonState::vc_71_check_music_queue,
+	&SimonState::vc_72_play_track_2,
 	&SimonState::vc_73_set_op189_flag,
 	&SimonState::vc_74_clear_op189_flag,
 };
@@ -1693,7 +1693,7 @@
 	if (!_video_var_3) {
 		if (_game & GF_SIMON2) {
 			if (_next_music_to_play != -1)
-				playMusic(_next_music_to_play);
+				loadMusic(_next_music_to_play);
 		}
 	} else
 		_video_var_3 = true;
@@ -1802,14 +1802,11 @@
 		vc_skip_next_instruction();
 }
 
-void SimonState::vc_69() {
+void SimonState::vc_69_play_track() {
 	// Simon2
 	int16 track = vc_read_next_word();
 	int16 loop = vc_read_next_word();
 
-	if (_debugMode)
-		debug (0, "vc_69(%d,%d): Play track", track, loop);
-
 	// Jamieson630:
 	// This is a "play track". The original
 	// design stored the track to play if one was
@@ -1825,29 +1822,11 @@
 	// specifying a non-valid track number (999 or -1)
 	// as a means of stopping what music is currently
 	// playing.
-	if (_vc72_var1 != track) {
-		midi.setLoop (loop != 0);
-		midi_play (track);
-		_vc72_var1 = track;
-		_vc72_var2 = -1;
-		_vc72_var3 = -1;
-		_vc70_var1 = -1;
-		_vc70_var2 = loop;
-	}
-/*
-	// ORIGINAL TRANSLATION FROM DISASSEMBLY
-	if (_vc72_var1 == 999 || _vc72_var1 == -1) {
-		_vc70_var2 = loop;
-		midi_play (track);
-		_vc72_var1 = track;
-	} else if (_vc72_var1 != track) {
-		_vc72_var3 = track;
-		_vc72_var2 = loop; // (a & 0xFF) << 8 | (a >> 8);
-	}
-*/
+	midi.setLoop (loop != 0);
+	midi.jump (track, 0);
 }
 
-void SimonState::vc_70() {
+void SimonState::vc_70_queue_music() {
 	// Simon2
 	uint16 track = vc_read_next_word();
 	uint16 loop = vc_read_next_word();
@@ -1857,50 +1836,27 @@
 	// It specifies whether to loop the current
 	// track and, if not, whether to switch to
 	// a different track upon completion.
-	_vc70_var1 = track;
-	_vc70_var2 = loop;
-
 	midi.setLoop (loop != 0);
-	if (_vc70_var1 != -1 && _vc70_var1 != 999)
+	if (track != -1 && track != 999)
 		midi.queueTrack ((byte) track, 0);
-
-	if (_debugMode)
-		debug (0, "vc_70 (%d,%d): Set end of track conditions", track, loop);
 }
 
-void SimonState::vc_71() {
+void SimonState::vc_71_check_music_queue() {
 	// Simon2
 	// Jamieson630:
 	// This command skips the next instruction
 	// unless (1) there is a track playing, AND
 	// (2) there is a track queued to play after it.
-	if (_debugMode)
-		debug (0, "vc_71(): Is music playing? %s", midi.isPlaying(true) ? "YES" : "NO");
-
 	if (!midi.isPlaying (true))
 		vc_skip_next_instruction();
-/*
-	// ORIGINAL TRANSLATION FROM DISASSEMBLY
-	if (_vc72_var3 == -1 && _vc70_var1 == -1)
-		vc_skip_next_instruction();
-*/
 }
 
-void SimonState::vc_72() {
+void SimonState::vc_72_play_track_2() {
 	// Simon2
 	// Jamieson630:
-	// This is a "play or stop track". The original
-	// design stored the track to play if one was
-	// already in progress, so that the next time a
-	// "fill MIDI stream" event occured, the MIDI
-	// player would find the change and switch
-	// tracks. We use a different architecture that
-	// allows for an immediate response here, but
-	// we'll simulate the variable changes so other
-	// scripts don't get thrown off.
-
-	// NOTE: This opcode looks very similar in function
-	// to vc_72(), except that this opcode may allow
+	// This is a "play or stop track". Note that
+	// this opcode looks very similar in function
+	// to vc_69(), except that this opcode may allow
 	// for specifying a track of 999 or -1 in order to
 	// stop the music. We'll code it that way for now.
 
@@ -1913,30 +1869,12 @@
 	int16 track = vc_read_next_word();
 	int16 loop = vc_read_next_word();
 
-	if (_debugMode)
-		debug (0, "vc_72 (%d, %d): Play or stop track", track, loop);
-
-	if (track != _vc72_var1) {
-		if (track == -1 || track == 999) {
-			midi.stop();
-			_vc72_var1 = -1;
-		} else {
-			midi.setLoop (loop != 0);
-			midi_play (track);
-			_vc72_var1 = track;
-			_vc70_var2 = loop;
-		}
-		_vc72_var3 = -1;
-	}
-/*
-	// ORIGINAL TRANSLATION FROM DISASSEMBLY
-	uint16 a = vc_read_next_word();
-	uint16 b = vc_read_next_word();
-	if (a != _vc72_var1) {
-		_vc72_var2 = b;
-		_vc72_var3 = a;
+	if (track == -1 || track == 999) {
+		midi.stop();
+	} else {
+		midi.setLoop (loop != 0);
+		midi.jump (track, 0);
 	}
-*/
 }
 
 void SimonState::vc_73_set_op189_flag() {