[Scummvm-cvs-logs] SF.net SVN: scummvm: [26589] scummvm/trunk/engines/agi

[thebluegr at users.sourceforge.net]

Revision: 26589
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26589&view=rev
Author:   thebluegr
Date:     2007-04-24 08:43:16 -0700 (Tue, 24 Apr 2007)

Log Message:
-----------
Patch #1705791: Patch for #1648396 - AGI : SQ2 / 2.0F / IBM / priority line

Modify a workaround made for SQ1 to work on SQ1 only, not all AGI games. This fixes bug #1648396 with SQ2, a bug with LSL1 (Sarien bug #925074) and possibly others

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agi/sprite.cpp

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-04-24 14:02:25 UTC (rev 26588)
+++ scummvm/trunk/engines/agi/agi.h	2007-04-24 15:43:16 UTC (rev 26589)
@@ -111,7 +111,8 @@
 	GF_MACGOLDRUSH = (1 << 5),
 	GF_FANMADE =     (1 << 6),
 	GF_ESC_MENU =    (1 << 7),
-	GF_MANHUNTER =   (1 << 8)
+	GF_MANHUNTER =   (1 << 8),
+	GF_SQ1 =         (1 << 9)
 };
 
 struct AGIGameDescription;

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-04-24 14:02:25 UTC (rev 26588)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-04-24 15:43:16 UTC (rev 26589)
@@ -1236,7 +1236,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2440,
 	},
 
@@ -1252,7 +1252,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2272,
 	},
 
@@ -1268,7 +1268,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2440,
 	},
 
@@ -1284,7 +1284,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2440,
 	},
 
@@ -1300,7 +1300,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2917,
 	},
 
@@ -1316,7 +1316,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2089,
 	},
 
@@ -1332,7 +1332,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2272,
 	},
 
@@ -1348,7 +1348,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_SQ1,
 		0x2440,
 	},
 

Modified: scummvm/trunk/engines/agi/sprite.cpp
===================================================================
--- scummvm/trunk/engines/agi/sprite.cpp	2007-04-24 14:02:25 UTC (rev 26588)
+++ scummvm/trunk/engines/agi/sprite.cpp	2007-04-24 15:43:16 UTC (rev 26589)
@@ -618,11 +618,13 @@
 		/* add rectangle around object, don't clobber control
 		 * info in priority data. The box extends to the end of
 		 * its priority band!
-		 *
-		 * SQ1 needs +1 (see bug #810331)
 		 */
-		y3 = (y2 / 12) * 12 + 1;
+		y3 = (y2 / 12) * 12;
 
+		// SQ1 needs +1 (see bug #810331)
+		if (_vm->getFeatures() & GF_SQ1)
+			y3++;
+
 		// don't let box extend below y.
 		if (y3 > y2) y3 = y2;
 


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