[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.320,1.321 simon.h,1.95,1.96 vga.cpp,1.85,1.86

[Travis Howell]

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

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

Missed one


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- simon.cpp	21 Oct 2003 11:41:33 -0000	1.320
+++ simon.cpp	21 Oct 2003 11:45:46 -0000	1.321
@@ -3384,7 +3384,7 @@
 	return vsp;
 }
 
-bool SimonEngine::has_vgastruct_with_id(uint16 id, uint16 file) {
+bool SimonEngine::has_vga_sprite_with_id(uint16 id, uint16 file) {
 	VgaSprite *vsp = _vga_sprites;
 	while (vsp->id) {
 		if (_game & GF_SIMON2) {
@@ -3857,7 +3857,7 @@
 
 	_lock_word |= 0x40;
 
-	if (has_vgastruct_with_id(vga_sprite_id, vga_res)) {
+	if (has_vga_sprite_with_id(vga_sprite_id, vga_res)) {
 		_lock_word &= ~0x40;
 		return;
 	}

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- simon.h	21 Oct 2003 11:41:33 -0000	1.95
+++ simon.h	21 Oct 2003 11:45:46 -0000	1.96
@@ -693,7 +693,7 @@
 
 	void expire_vga_timers();
 
-	bool has_vgastruct_with_id(uint16 id, uint16 file);
+	bool has_vga_sprite_with_id(uint16 id, uint16 file);
 
 	bool vc_get_bit(uint bit);
 

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- vga.cpp	21 Oct 2003 11:41:33 -0000	1.85
+++ vga.cpp	21 Oct 2003 11:45:46 -0000	1.86
@@ -289,7 +289,7 @@
 	base_color = vc_read_next_word();		/* 8 */
 
 	/* 2nd param ignored with simon1 */
-	if (has_vgastruct_with_id(vga_sprite_id, f))
+	if (has_vga_sprite_with_id(vga_sprite_id, f))
 		return;
 
 	vsp = _vga_sprites;