aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2003-06-19 18:08:39 +0000
committerMax Horn2003-06-19 18:08:39 +0000
commita3feb4608087ed6ec65edcf116dc0926dab4f014 (patch)
treeff0e0b35d3c9bfc6daec212f7db7cfa60dff1ec1 /scumm/object.cpp
parent2421128e8e3f399e96f9ce179604bbe09db043e6 (diff)
downloadscummvm-rg350-a3feb4608087ed6ec65edcf116dc0926dab4f014.tar.gz
scummvm-rg350-a3feb4608087ed6ec65edcf116dc0926dab4f014.tar.bz2
scummvm-rg350-a3feb4608087ed6ec65edcf116dc0926dab4f014.zip
instead of casting to byte, rather allow offsets > 255
svn-id: r8564
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index ae0317ca94..06e660b404 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -926,14 +926,14 @@ const byte *Scumm::getObjOrActorName(int obj) {
return NULL;
if (_features & GF_SMALL_HEADER) {
- byte offset = 0;
+ int offset = 0;
if (_version <= 2)
offset = *(objptr + 14);
else if (_features & GF_OLD_BUNDLE)
offset = *(objptr + 16);
else
- offset = (byte) READ_LE_UINT16(objptr + 18);
+ offset = READ_LE_UINT16(objptr + 18);
return (objptr + offset);
}