[Scummvm-cvs-logs] SF.net SVN: scummvm: [24664] scummvm/trunk/engines/saga

[sev at users.sourceforge.net]

Revision: 24664
          http://svn.sourceforge.net/scummvm/?rev=24664&view=rev
Author:   sev
Date:     2006-11-09 05:19:23 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Workaround for bug #1259608: "ITE: Riff ignores command in Ferret merchant
center"

Modified Paths:
--------------
    scummvm/trunk/engines/saga/objectmap.cpp
    scummvm/trunk/engines/saga/objectmap.h

Modified: scummvm/trunk/engines/saga/objectmap.cpp
===================================================================
--- scummvm/trunk/engines/saga/objectmap.cpp	2006-11-09 10:41:29 UTC (rev 24663)
+++ scummvm/trunk/engines/saga/objectmap.cpp	2006-11-09 13:19:23 UTC (rev 24664)
@@ -41,7 +41,7 @@
 
 namespace Saga {
 
-HitZone::HitZone(MemoryReadStreamEndian *readStream, int index): _index(index) {
+HitZone::HitZone(MemoryReadStreamEndian *readStream, int index, int sceneNumber): _index(index) {
 	int i, j;
 	HitZone::ClickArea *clickArea;
 	Point *point;
@@ -74,6 +74,13 @@
 			point = &clickArea->points[j];
 			point->x = readStream->readSint16();
 			point->y = readStream->readSint16();
+
+			// WORKAROUND: bug #1259608: "ITE: Riff ignores command in Ferret merchant center"
+			// Apparently ITE Mac version has bug in game data. Both ObjectMap and ActionMap
+			// for exit area are little taller (y = 123) and thus Riff goes to exit 
+			// when clicked on barrel of nails.
+			if (sceneNumber == 18 && index == 0 && i == 0 && j == 0 && point->y == 123)
+				point->y = 129;
 		}
 	}
 }
@@ -198,7 +205,7 @@
 	}
 
 	for (i = 0; i < _hitZoneListCount; i++) {
-		_hitZoneList[i] = new HitZone(&readS, i);
+		_hitZoneList[i] = new HitZone(&readS, i, _vm->_scene->currentSceneNumber());
 	}
 }
 

Modified: scummvm/trunk/engines/saga/objectmap.h
===================================================================
--- scummvm/trunk/engines/saga/objectmap.h	2006-11-09 10:41:29 UTC (rev 24663)
+++ scummvm/trunk/engines/saga/objectmap.h	2006-11-09 13:19:23 UTC (rev 24664)
@@ -40,7 +40,7 @@
 	};
 
 public:
-	HitZone(MemoryReadStreamEndian *readStream, int index);
+	HitZone(MemoryReadStreamEndian *readStream, int index, int sceneNumber);
 	~HitZone();
 
 	int getNameIndex() const {


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