[Scummvm-cvs-logs] SF.net SVN: scummvm: [22130] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22130
Author:   kirben
Date:     2006-04-23 21:34:57 -0700 (Sun, 23 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22130&view=rev

Log Message:
-----------
isSpriteLoaded is Simon 1/2 specific and never used by FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/simon.h
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-24 02:11:04 UTC (rev 22129)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-24 04:34:57 UTC (rev 22130)
@@ -2204,7 +2204,7 @@
 	}
 }
 
-void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
+void SimonEngine::set_video_mode_internal(uint16 mode, uint16 vga_res_id) {
 	uint num, num_lines;
 	VgaPointersEntry *vpe;
 	byte *bb, *b;
@@ -2216,7 +2216,6 @@
 
 	if (getGameType() == GType_FF) {
 		vc27_resetSprite();
-		vga_res_id &= 0xFFFF;
 	}
 
 	if (vga_res_id == 0) {
@@ -3228,7 +3227,8 @@
 
 	_lockWord |= 0x40;
 
-	if (isSpriteLoaded(vgaSpriteId, zoneNum)) {
+	if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
+		isSpriteLoaded(vgaSpriteId, zoneNum)) {
 		_lockWord &= ~0x40;
 		return;
 	}

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-24 02:11:04 UTC (rev 22129)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-24 04:34:57 UTC (rev 22130)
@@ -699,7 +699,7 @@
 
 	void handleVerbClicked(uint verb);
 
-	void set_video_mode_internal(uint mode, uint vga_res_id);
+	void set_video_mode_internal(uint16 mode, uint16 vga_res_id);
 
 	void loadZone(uint vga_res);
 

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-24 02:11:04 UTC (rev 22129)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-24 04:34:57 UTC (rev 22130)
@@ -242,15 +242,12 @@
 
 void SimonEngine::vc2_call() {
 	VgaPointersEntry *vpe;
-	uint num;
-	uint res;
+	uint16 num, res;
 	byte *old_file_1, *old_file_2;
 	byte *b, *bb;
 	const byte *vc_ptr_org;
 
 	num = vcReadVarOrWord();
-	if (getGameType() == GType_FF)
-		num &= 0xFFFF;
 
 	old_file_1 = _curVgaFile1;
 	old_file_2 = _curVgaFile2;
@@ -325,9 +322,10 @@
 	y = vcReadNextWord();			/* 6 */
 	palette = vcReadNextWord();		/* 8 */
 
-	/* 2nd param ignored with simon1 */
-	if (isSpriteLoaded(vgaSpriteId, zoneNum))
+	if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
+		isSpriteLoaded(vgaSpriteId, zoneNum)) {
 		return;
+	}
 
 	vsp = _vgaSprites;
 	while (vsp->id)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.