From 03abddf888ccbf422b356d2cb62bf81318e2bc04 Mon Sep 17 00:00:00 2001
From: Ludvig Strigeus
Date: Sat, 29 Dec 2001 13:19:53 +0000
Subject: workaround to prevent crashes in the indy4 world map (seems to be a
 bug in indy4's scripts)

svn-id: r3540
---
 object.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/object.cpp b/object.cpp
index 2b6fcec46f..46acf689f2 100644
--- a/object.cpp
+++ b/object.cpp
@@ -710,6 +710,8 @@ void Scumm::setOwnerOf(int obj, int owner) {
 
 int Scumm::getObjX(int obj) {
 	if (obj < NUM_ACTORS) {
+		if (obj==0)
+			return 0; /* fix for indy4's map */
 		return derefActorSafe(obj,"getObjX")->x;
 	} else {
 		if (whereIsObject(obj)==WIO_NOT_FOUND)
@@ -721,6 +723,8 @@ int Scumm::getObjX(int obj) {
 
 int Scumm::getObjY(int obj) {
 	if (obj < NUM_ACTORS) {
+		if (obj==0)
+			return 0; /* fix for indy4's map */
 		return derefActorSafe(obj,"getObjY")->y;
 	} else {
 		if (whereIsObject(obj)==WIO_NOT_FOUND)
-- 
cgit v1.2.3