From 91c602de137447746bfdf10eb929714a0222f4eb Mon Sep 17 00:00:00 2001
From: Sergey Semushin <predelnik@gmail.com>
Date: Thu, 25 Apr 2019 21:24:32 +0300
Subject: [PATCH] Clean up Obj_Door.

---
 Source/objects.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Source/objects.cpp b/Source/objects.cpp
index b04baf77b..3737b4ebc 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -1913,23 +1913,22 @@ void Obj_StopAnim(int i)
 
 void Obj_Door(int i)
 {
-	int dy; // edx
-	int dx; // eax
+	int dx, dy;
 
-	if (object[i]._oVar4) {
+	if (!object[i]._oVar4) {
+		object[i]._oMissFlag = FALSE;
+		object[i]._oSelFlag = 3;
+	} else {
 		dy = object[i]._oy;
 		dx = object[i]._ox;
 		object[i]._oSelFlag = 2;
 		object[i]._oMissFlag = TRUE;
-		object[i]._oVar4 = ((dItem[dx][dy] == 0
-		                        && dDead[dx][dy] == 0
-		                        && dPlayer[dx][dy] == 0
-		                        && dMonster[dx][dy] == 0)
-		                       == 0)
-		    + 1;
-	} else {
-		object[i]._oMissFlag = FALSE;
-		object[i]._oSelFlag = 3;
+		object[i]._oVar4 = (((dItem[dx][dy] == 0 ? 1 : 0)
+					& (dDead[dx][dy] == 0 ? 1 : 0)
+					& (dPlayer[dx][dy] == 0 ? 1 : 0)
+					& (dMonster[dx][dy] == 0 ? 1 : 0))
+				== 0)
+			+ 1;
 	}
 }