[Scummvm-cvs-logs] CVS: scummvm/simon debug.h,1.4,1.5 simon.h,1.38,1.39 vga.cpp,1.23,1.24

[Travis Howell]

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

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

Correct error in last commit


Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- debug.h	8 Dec 2002 14:48:56 -0000	1.4
+++ debug.h	8 Dec 2002 15:39:57 -0000	1.5
@@ -1052,7 +1052,7 @@
 	"|DUMMY57",
 	"|UNK58",
 	"|DUMMY_9",
-	"|SKIP_IF_SPEECH",
+	"|SKIP_IF_TEXT",
 	/* 60 */
 	"d|KILL_THREAD",
 	"ddd|INIT_SPRITE",
@@ -1143,7 +1143,7 @@
 	"|PALETTE_THING",
 	"|PALETTE_THING_2",
 	/* 64 */
-	"|SKIP_IF_SPEECH",
+	"|SKIP_IF_TEXT",
 	"|PALETTE_THING_3",
 	"|SKIP_IF_NZ",
 	"|SKIP_IF_GE",

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- simon.h	8 Dec 2002 14:48:56 -0000	1.38
+++ simon.h	8 Dec 2002 15:39:57 -0000	1.39
@@ -653,7 +653,7 @@
 	void vc_63_palette_thing_2();
 
 	// Simon2 specific Video Script Opcodes
-	void vc_64_skip_if_speech();
+	void vc_64_skip_if_text();
 	void vc_65_palette_thing_3();
 	void vc_66_skip_if_nz();
 	void vc_67_skip_if_ge();

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- vga.cpp	8 Dec 2002 14:48:56 -0000	1.23
+++ vga.cpp	8 Dec 2002 15:39:57 -0000	1.24
@@ -94,7 +94,7 @@
 	&SimonState::vc_61_sprite_change,
 	&SimonState::vc_62_palette_thing,
 	&SimonState::vc_63_palette_thing_2,
-	&SimonState::vc_64_skip_if_speech,
+	&SimonState::vc_64_skip_if_text,
 	&SimonState::vc_65_palette_thing_3,
 	&SimonState::vc_66_skip_if_nz,
 	&SimonState::vc_67_skip_if_ge,
@@ -1851,7 +1851,7 @@
 	_video_var_3 = false;
 }
 
-void SimonState::vc_64_skip_if_speech()
+void SimonState::vc_64_skip_if_text()
 {																// Simon2
 	if (vc_59_helper())
 		vc_skip_next_instruction();