From 3bc2eb8471dba8693c6c7f83f83057f33ab0604e Mon Sep 17 00:00:00 2001
From: ephphatha <ephphatha@thelettereph.com>
Date: Wed, 29 Dec 2021 12:10:12 +1100
Subject: [PATCH] Use ObjectAtPosition when highlighting from gamepad movement

---
 Source/controls/plrctrls.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
index 3de803eed..39f7afbcb 100644
--- a/Source/controls/plrctrls.cpp
+++ b/Source/controls/plrctrls.cpp
@@ -163,16 +163,12 @@ void FindItemOrObject()
 	}
 
 	for (Point targetPosition : searchArea) {
-		int8_t objectId = abs(dObject[targetPosition.x][targetPosition.y]) - 1;
-		if (objectId < 0) {
+		Object *object = ObjectAtPosition(targetPosition);
+		if (object == nullptr || object->_oSelFlag == 0) {
+			// No object or non-interactive object
 			continue;
 		}
-
-		Object &object = Objects[objectId];
-		if (object._oSelFlag == 0) {
-			continue;
-		}
-		if (targetPosition == futurePosition && object._oDoorFlag) {
+		if (targetPosition == futurePosition && object->_oDoorFlag) {
 			continue; // Ignore doorway so we don't get stuck behind barrels
 		}
 
@@ -184,12 +180,12 @@ void FindItemOrObject()
 			// Don't check the tile we're leaving if the player is walking
 			continue;
 		}
-		if (object.IsDisabled()) {
+		if (object->IsDisabled()) {
 			continue;
 		}
 
 		rotations = newRotations;
-		pcursobj = objectId;
+		pcursobj = object->GetId();
 		cursPosition = targetPosition;
 	}
 }