From 06686c09f00700ac07b5503aad41e02696cfdb16 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Sat, 29 Jul 2017 15:53:35 -0500
Subject: SCI32: Fix breakpoints on reading/writing selectors in SCI3

---
 engines/sci/engine/scriptdebug.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'engines/sci/engine/scriptdebug.cpp')

diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 1b3f18694e..f31a43cec4 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -950,11 +950,21 @@ void debugPropertyAccess(Object *obj, reg_t objp, unsigned int index, reg_t curV
 	const Object *var_container = obj;
 	if (!obj->isClass() && getSciVersion() != SCI_VERSION_3)
 		var_container = segMan->getObject(obj->getSuperClassSelector());
-	if ((index >> 1) >= var_container->getVarCount()) {
-		// TODO: error, warning, debug?
-		return;
+
+	uint16 varSelector;
+	if (getSciVersion() == SCI_VERSION_3) {
+		varSelector = index;
+	} else {
+		index >>= 1;
+
+		if (index >= var_container->getVarCount()) {
+			// TODO: error, warning, debug?
+			return;
+		}
+
+		varSelector = var_container->getVarSelector(index);
 	}
-	uint16 varSelector = var_container->getVarSelector(index >> 1);
+
 	if (g_sci->checkSelectorBreakpoint(breakpointType, objp, varSelector)) {
 		// checkSelectorBreakpoint has already triggered the breakpoint.
 		// We just output the relevant data here.
-- 
cgit v1.2.3