libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 01:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug #775420; also properly implemented the 'box matrix truncated' workaround

Browse Source 
svn-id: r9129
This commit is contained in:
Max Horn 2003-07-22 19:01:38 +00:00
parent 655759a70d
commit dce17ed7ac
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scumm/boxes.cpp
View File

@ -616,6 +616,7 @@ int Scumm::getPathToDestBox(byte from, byte to) {
const byte *boxm;
byte i;
const int numOfBoxes = getNumBoxes();
int dest = -1;
if (from == to)
return to;
@ -662,7 +663,7 @@ int Scumm::getPathToDestBox(byte from, byte to) {
// Skip up to the matrix data for box 'from'
for (i = 0; i < from && boxm < end; i++) {
while (*boxm != 0xFF)
while (boxm < end && *boxm != 0xFF)
boxm += 3;
boxm++;
}
@ -670,14 +671,14 @@ int Scumm::getPathToDestBox(byte from, byte to) {
// Now search for the entry for box 'to'
while (boxm < end && boxm[0] != 0xFF) {
if (boxm[0] <= to && to <= boxm[1])
return (int8)boxm[2];
dest = (int8)boxm[2];
boxm += 3;
}
if (boxm >= end)
warning("The box matrix apparently is truncated (room %d)", _roomResource);
return -1;
return dest;
}
/*