aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-04-29 18:22:07 +0000
committerMax Horn2007-04-29 18:22:07 +0000
commit3821ef456a8d39752d4809fc3b60c4f00ca482a4 (patch)
treef8e78f554c3792f61b8b02768b503070461dcd6c
parent21e53116507c57f1639126cd04bd7fe9c864896c (diff)
downloadscummvm-rg350-3821ef456a8d39752d4809fc3b60c4f00ca482a4.tar.gz
scummvm-rg350-3821ef456a8d39752d4809fc3b60c4f00ca482a4.tar.bz2
scummvm-rg350-3821ef456a8d39752d4809fc3b60c4f00ca482a4.zip
Change getNumBoxes() to properly read the full uint16 box count (shouldn't affect anything, though)
svn-id: r26678
-rw-r--r--engines/scumm/boxes.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index b343fde319..7b51268f42 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -443,7 +443,9 @@ byte ScummEngine::getNumBoxes() {
if (!ptr)
return 0;
if (_game.version == 8)
- return (byte) READ_LE_UINT32(ptr);
+ return (byte)READ_LE_UINT32(ptr);
+ else if (_game.features >= 5)
+ return (byte)READ_LE_UINT16(ptr);
else
return ptr[0];
}