[Scummvm-cvs-logs] CVS: scummvm/simon debug.h,1.3,1.4 simon.h,1.37,1.38 vga.cpp,1.22,1.23

Travis Howell kirben at users.sourceforge.net
Sun Dec 8 06:49:03 CET 2002


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

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

A few video opcode renames


Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debug.h	29 Nov 2002 15:19:45 -0000	1.3
+++ debug.h	8 Dec 2002 14:48:56 -0000	1.4
@@ -980,11 +980,11 @@
 const char *const simon1_video_opcode_name_table[] = {
 	/* 0 */
 	"x|RET",
-	"ddd|DUMMY",
+	"ddd|DUMMY1",
 	"d|CALL",
 	"ddddd|NEW_THREAD",
 	/* 4 */
-	"ddd|DUMMY_2",
+	"ddd|DUMMY4",
 	"vd|SKIP_IF_NEQ",
 	"d|SKIP_IFN_SIB_WITH_A",
 	"d|SKIP_IF_SIB_WITH_A",
@@ -1022,7 +1022,7 @@
 	"vv|COPY_VAR",
 	"|FORCE_UNLOCK",
 	"|FORCE_LOCK",
-	"dd|DUMMY_4",
+	"dd|VC35",
 	/* 36 */
 	"dd|SAVELOAD_THING",
 	"v|OFFSET_Y_F",
@@ -1044,15 +1044,15 @@
 	"d|CLEAR_BIT",
 	"d|CLEAR_HITAREA_BIT_0x40",
 	/* 52 */
-	"d|VC_52",
-	"dd|DUMMY_5",
-	"ddd|DUMMY_6",
+	"d|PLAY_SOUND",
+	"dd|DUMMY53",
+	"ddd|DUMMY54",
 	"ddd|OFFSET_HIT_AREA",
 	/* 56 */
-	"|DUMMY_7",
-	"|DUMMY_8",
+	"|DUMMY57",
+	"|UNK58",
 	"|DUMMY_9",
-	"|SKIP_IF_SOUND??",
+	"|SKIP_IF_SPEECH",
 	/* 60 */
 	"d|KILL_THREAD",
 	"ddd|INIT_SPRITE",
@@ -1064,11 +1064,11 @@
 const char *const simon2_video_opcode_name_table[] = {
 	/* 0 */
 	"x|RET",
-	"ddd|DUMMY",
+	"ddd|DUMMY1",
 	"d|CALL",
 	"ddddd|NEW_THREAD",
 	/* 4 */
-	"ddd|DUMMY_2",
+	"ddd|DUMMY4",
 	"vd|SKIP_IF_NEQ",
 	"d|SKIP_IFN_SIB_WITH_A",
 	"d|SKIP_IF_SIB_WITH_A",
@@ -1106,7 +1106,7 @@
 	"vv|COPY_VAR",
 	"|FORCE_UNLOCK",
 	"|FORCE_LOCK",
-	"dd|DUMMY_4",
+	"dd|VC35",
 	/* 36 */
 	"dd|SAVELOAD_THING",
 	"v|OFFSET_Y_F",
@@ -1128,14 +1128,14 @@
 	"d|CLEAR_BIT",
 	"d|CLEAR_HITAREA_BIT_0x40",
 	/* 52 */
-	"d|VC_52",
-	"dd|DUMMY_5",
-	"ddd|DUMMY_6",
+	"d|PLAY_SOUND",
+	"dd|DUMMY53",
+	"ddd|DUMMY54",
 	"ddd|OFFSET_HIT_AREA",
 	/* 56 */
 	"i|SLEEP_EX",
-	"|DUMMY_8",
-	"|DUMMY_9",
+	"|DUMMY_57",
+	"|UNK58",
 	"ddd|KILL_MULTI_THREAD",
 	/* 60 */
 	"dd|KILL_THREAD",
@@ -1143,18 +1143,18 @@
 	"|PALETTE_THING",
 	"|PALETTE_THING_2",
 	/* 64 */
-	"|UNK64",
-	"|UNK65",
-	"|UNK66",
-	"|UNK67",
+	"|SKIP_IF_SPEECH",
+	"|PALETTE_THING_3",
+	"|SKIP_IF_NZ",
+	"|SKIP_IF_GE",
 	/* 68 */
-	"|UNK68",
+	"|SKIP_IF_LE",
 	"dd|UNK69",
 	"dd|UNK70",
 	"|UNK71",
 	/* 72 */
 	"dd|UNK72",
-	"bb|UNK73",
-	"bb|UNK74",
+	"bb|SET_OP189_FLAG",
+	"bb|CLEAR_OP189_FLAG",
 };
 

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- simon.h	8 Dec 2002 02:01:28 -0000	1.37
+++ simon.h	8 Dec 2002 14:48:56 -0000	1.38
@@ -640,7 +640,7 @@
 	void vc_49_set_bit();
 	void vc_50_clear_bit();
 	void vc_51_clear_hitarea_bit_0x40();
-	void vc_52();
+	void vc_52_play_sound();
 	void vc_53_no_op();
 	void vc_54_no_op();
 	void vc_55_offset_hit_area();
@@ -653,11 +653,11 @@
 	void vc_63_palette_thing_2();
 
 	// Simon2 specific Video Script Opcodes
-	void vc_64();
-	void vc_65();
-	void vc_66_nz();
-	void vc_67_ge();
-	void vc_68_le();
+	void vc_64_skip_if_speech();
+	void vc_65_palette_thing_3();
+	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();

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- vga.cpp	6 Dec 2002 02:14:37 -0000	1.22
+++ vga.cpp	8 Dec 2002 14:48:56 -0000	1.23
@@ -82,7 +82,7 @@
 	&SimonState::vc_49_set_bit,
 	&SimonState::vc_50_clear_bit,
 	&SimonState::vc_51_clear_hitarea_bit_0x40,
-	&SimonState::vc_52,
+	&SimonState::vc_52_play_sound,
 	&SimonState::vc_53_no_op,
 	&SimonState::vc_54_no_op,
 	&SimonState::vc_55_offset_hit_area,
@@ -94,11 +94,11 @@
 	&SimonState::vc_61_sprite_change,
 	&SimonState::vc_62_palette_thing,
 	&SimonState::vc_63_palette_thing_2,
-	&SimonState::vc_64,
-	&SimonState::vc_65,
-	&SimonState::vc_66_nz,
-	&SimonState::vc_67_ge,
-	&SimonState::vc_68_le,
+	&SimonState::vc_64_skip_if_speech,
+	&SimonState::vc_65_palette_thing_3,
+	&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,
@@ -1596,7 +1596,7 @@
 	clear_hitarea_bit_0x40(vc_read_next_word());
 }
 
-void SimonState::vc_52()
+void SimonState::vc_52_play_sound()
 {
 	uint16 a = vc_read_next_word();
 
@@ -1851,13 +1851,13 @@
 	_video_var_3 = false;
 }
 
-void SimonState::vc_64()
+void SimonState::vc_64_skip_if_speech()
 {																// Simon2
 	if (vc_59_helper())
 		vc_skip_next_instruction();
 }
 
-void SimonState::vc_65()
+void SimonState::vc_65_palette_thing_3()
 {																// Simon2
 	_palette_color_count = 0x270;
 	_video_num_pal_colors = 0x0D0;
@@ -1869,7 +1869,7 @@
 	_video_var_3 = false;
 }
 
-void SimonState::vc_66_nz()
+void SimonState::vc_66_skip_if_nz()
 {																// Simon2
 	uint a = vc_read_next_word();
 	uint b = vc_read_next_word();
@@ -1878,7 +1878,7 @@
 		vc_skip_next_instruction();
 }
 
-void SimonState::vc_67_ge()
+void SimonState::vc_67_skip_if_ge()
 {																// Simon2
 	uint a = vc_read_next_word();
 	uint b = vc_read_next_word();
@@ -1887,7 +1887,7 @@
 		vc_skip_next_instruction();
 }
 
-void SimonState::vc_68_le()
+void SimonState::vc_68_skip_if_le()
 {																// Simon2
 	uint a = vc_read_next_word();
 	uint b = vc_read_next_word();





More information about the Scummvm-git-logs mailing list