[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.25,1.26 simon.cpp,1.105,1.106 simon.h,1.28,1.29 vga.cpp,1.20,1.21

[Travis Howell]

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

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

Change dump start vgascript into separate option again.


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- items.cpp	29 Nov 2002 12:01:03 -0000	1.25
+++ items.cpp	1 Dec 2002 08:56:04 -0000	1.26
@@ -37,7 +37,7 @@
 	bool flag, condition;
 
 	do {
-		if (_mainscript_toggle)
+		if (_continous_mainscript)
 			dumpOpcode(_code_ptr);
 
 		opcode = getByte();
@@ -1195,7 +1195,7 @@
 	SubroutineLine *sl;
 	byte *old_code_ptr;
 
-	if (_mainscript_toggle)
+	if (_start_mainscript)
 		dumpSubroutine(sub);
 
 	old_code_ptr = _code_ptr;
@@ -1214,7 +1214,7 @@
 			else
 				_code_ptr += 8;
 
-			if (_mainscript_toggle)
+			if (_continous_mainscript)
 				fprintf(_dump_file, "; %d\n", sub->id);
 			result = runScript();
 			if (result != 0) {

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- simon.cpp	30 Nov 2002 11:07:06 -0000	1.105
+++ simon.cpp	1 Dec 2002 08:56:04 -0000	1.106
@@ -4479,8 +4479,9 @@
 	_last_music_played = (uint) - 1;
 	_vga_base_delay = 1;
 	
-	_mainscript_toggle = false;
-	_vgascript_toggle = false;
+	_start_mainscript = false;
+	_continous_mainscript = false;
+	_continous_vgascript = false;
 
 	if (_sound->hasVoice()) {
 		_vk_t_toggle = false;
@@ -4527,10 +4528,12 @@
 		while (_system->poll_event(&event)) {
 			switch (event.event_code) {
 				case OSystem::EVENT_KEYDOWN:
-				if (event.kbd.ascii == 'o') {
-					_mainscript_toggle ^= 1;
+				if (event.kbd.ascii == 'r') {
+					_start_mainscript ^= 1;
+				} else if (event.kbd.ascii == 'o') {
+					_continous_mainscript ^= 1;
 				} else if (event.kbd.ascii == 'v') {
-					_vgascript_toggle ^= 1;
+					_continous_vgascript ^= 1;
 				} else if (event.kbd.ascii == 't') {
 					_vk_t_toggle ^= 1;
 				} else if (event.kbd.ascii == '+') {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- simon.h	29 Nov 2002 22:13:20 -0000	1.28
+++ simon.h	1 Dec 2002 08:56:04 -0000	1.29
@@ -173,8 +173,9 @@
 	bool _dx_use_3_or_4_for_lock;
 
 	bool _mouse_pos_changed;
-	bool _mainscript_toggle;
-	bool _vgascript_toggle;
+	bool _start_mainscript;
+	bool _continous_mainscript;
+	bool _continous_vgascript;
 	bool _vk_t_toggle;
 	byte _mouse_cursor;
 	bool _vga_var9;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- vga.cpp	29 Nov 2002 16:50:15 -0000	1.20
+++ vga.cpp	1 Dec 2002 08:56:04 -0000	1.21
@@ -113,7 +113,7 @@
 	for (;;) {
 		uint opcode;
 
-if (_vgascript_toggle) {
+if (_continous_vgascript) {
 		if ((void *)_vc_ptr != (void *)&vc_get_out_of_code) {
 //      if (_vga_cur_sprite_id==62 && _vga_cur_file_id==68 ||
 //          _vga_cur_sprite_id==1 && _vga_cur_file_id==2) {
@@ -196,7 +196,7 @@
 		_vc_ptr += opcode_param_len_simon1[opcode];
 	}
 
-	if (_vgascript_toggle)
+	if (_continous_vgascript)
 		fprintf(_dump_file, "; skipped\n");
 }
 
@@ -1647,7 +1647,7 @@
 	if (_game & GAME_SIMON2) {
 		uint num = vc_read_var_or_word() * _vga_base_delay;
 
-		if (_vgascript_toggle)
+		if (_continous_vgascript)
 			fprintf(_dump_file, "; sleep_ex = %d\n", num + gss->VGA_DELAY_BASE);
 
 		add_vga_timer(num + gss->VGA_DELAY_BASE, _vc_ptr, _vga_cur_sprite_id, _vga_cur_file_id);