From 7a3b80a9b7f414967fe59f89ab0fe5416735babe Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sun, 31 Jan 2021 20:44:39 +0100
Subject: First batch of fixes (CallAndMessage)

---
 src/control/Script6.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/control/Script6.cpp')

diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp
index 31be6987..f8e2d8f1 100644
--- a/src/control/Script6.cpp
+++ b/src/control/Script6.cpp
@@ -971,8 +971,10 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 					pClosestEntity = apEntities[i];
 				}
 			}
-			if (pClosestEntity->IsDummy())
-				pClosestEntity = nil;
+#ifdef FIX_BUGS
+			if(pClosestEntity)
+#endif
+				if(pClosestEntity->IsDummy()) pClosestEntity = nil;
 		}
 		if (pClosestEntity) {
 			script_assert(pClosestEntity->IsObject());
-- 
cgit v1.2.3