thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workaround for bug #1259608: "ITE: Riff ignores command in Ferret merchant

Browse source 
center"

svn-id: r24664
This commit is contained in:
Eugene Sandulenko 2006-11-09 13:19:23 +00:00
parent f334797caa
commit 9b28b7473c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/saga/objectmap.cpp
View file

@ -41,7 +41,7 @@
namespace Saga { namespace Saga {
HitZone::HitZone(MemoryReadStreamEndian *readStream, int index): _index(index) { HitZone::HitZone(MemoryReadStreamEndian *readStream, int index, int sceneNumber): _index(index) {
int i, j; int i, j;
HitZone::ClickArea *clickArea; HitZone::ClickArea *clickArea;
Point *point; Point *point;
@ -74,6 +74,13 @@ HitZone::HitZone(MemoryReadStreamEndian *readStream, int index): _index(index) {
point = &clickArea->points[j]; point = &clickArea->points[j];
point->x = readStream->readSint16(); point->x = readStream->readSint16();
point->y = 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 @@ void ObjectMap::load(const byte *resourcePointer, size_t resourceLength) {
} }
for (i = 0; i < _hitZoneListCount; i++) { for (i = 0; i < _hitZoneListCount; i++) {
_hitZoneList[i] = new HitZone(&readS, i); _hitZoneList[i] = new HitZone(&readS, i, _vm->_scene->currentSceneNumber());
} }
} }

2
engines/saga/objectmap.h
View file

@ -40,7 +40,7 @@ private:
}; };
public: public:
HitZone(MemoryReadStreamEndian *readStream, int index); HitZone(MemoryReadStreamEndian *readStream, int index, int sceneNumber);
~HitZone(); ~HitZone();
int getNameIndex() const { int getNameIndex() const {