From fc8e12444a74381fd3c67e49f266a689196691f5 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 20 Jun 2003 11:14:18 +0000
Subject: seems monkeyega & monkeyvga have byte values for the object name
 offset, too

svn-id: r8571
---
 scumm/object.cpp    | 7 ++-----
 scumm/script_v5.cpp | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'scumm')

diff --git a/scumm/object.cpp b/scumm/object.cpp
index cb23185a69..f8f4c8fa39 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -926,17 +926,14 @@ const byte *Scumm::getObjOrActorName(int obj) {
 		return NULL;
 
 	if (_features & GF_SMALL_HEADER) {
-		int offset = 0;
+		byte offset = 0;
 
 		if (_version <= 2)
 			offset = *(objptr + 14);
 		else if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
-		else if (_version == 3)
-			offset = *(objptr + 18);
 		else
-			// FIXME: is this really correct?
-			offset = READ_LE_UINT16(objptr + 18);
+			offset = *(objptr + 18);
 
 		return (objptr + offset);
 	}
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 3407ab890b..bfb803d223 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1917,15 +1917,12 @@ void Scumm_v5::o5_setObjectName() {
 	}
 
 	if (_features & GF_SMALL_HEADER) {
-		int offset = 0;
+		byte offset = 0;
 
 		if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
-		else if (_version == 3)
-			offset = *(objptr + 18);
 		else
-			// FIXME: is this really correct?
-			offset = READ_LE_UINT16(objptr + 18);
+			offset = *(objptr + 18);
 
 		size = READ_LE_UINT16(objptr) - offset;
 		name = objptr + offset;
-- 
cgit v1.2.3