From 3308d6b9dac03cc16e2e18212809fa2f45010f5f Mon Sep 17 00:00:00 2001
From: James Brown
Date: Sat, 16 Mar 2002 05:33:25 +0000
Subject: Lots of stuff - GUI fixes. More launcher work... and CD music working
 in MI1. Thanks to frob and realmz for their work on that.

svn-id: r3762
---
 object.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'object.cpp')

diff --git a/object.cpp b/object.cpp
index 5c93f0f9d2..e2d19386e4 100644
--- a/object.cpp
+++ b/object.cpp
@@ -672,7 +672,8 @@ byte *Scumm::getObjOrActorName(int obj) {
 		byte offset;
 
 		objptr = getOBCDFromObject(obj);
-		offset = *(objptr+18);
+		if (objptr)
+			offset = *(objptr+18);
 		return(objptr+offset);
         }
 
@@ -901,7 +902,7 @@ void Scumm::setOwnerOf(int obj, int owner) {
 
 int Scumm::getObjX(int obj) {
 	if (obj < NUM_ACTORS) {
-		if (obj==0)
+		if (obj<1)
 			return 0; /* fix for indy4's map */
 		return derefActorSafe(obj,"getObjX")->x;
 	} else {
@@ -914,7 +915,7 @@ int Scumm::getObjX(int obj) {
 
 int Scumm::getObjY(int obj) {
 	if (obj < NUM_ACTORS) {
-		if (obj==0)
+		if (obj<1)
 			return 0; /* fix for indy4's map */
 		return derefActorSafe(obj,"getObjY")->y;
 	} else {
-- 
cgit v1.2.3