From 37f78b958c98d6707d84eaf0e3854282a37b6644 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 27 Apr 2024 12:49:51 -0400
Subject: Fixed merge errors

---
 src/tracker_state.cpp | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'src/tracker_state.cpp')

diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp
index d3dde0d..0d9a9cd 100644
--- a/src/tracker_state.cpp
+++ b/src/tracker_state.cpp
@@ -212,7 +212,7 @@ class StateCalculator {
       }
 
       return kYes;
-    } else if ((AP_GetDoorShuffleMode() == kDOORS_MODE && AP_AreDoorsGrouped() &&
+    } else if (AP_GetDoorShuffleMode() == kDOORS_MODE && AP_AreDoorsGrouped() &&
                !door_obj.group_name.empty()) {
       return AP_HasItem(door_obj.group_ap_item_id) ? kYes : kNo;
     } else {
@@ -302,33 +302,34 @@ class StateCalculator {
       }
     }
 
-  if (AP_IsColorShuffle()) {
-    for (LingoColor color : panel_obj.colors) {
-      if (!AP_HasItem(GD_GetItemIdForColor(color))) {
-        return kNo;
+    if (AP_IsColorShuffle()) {
+      for (LingoColor color : panel_obj.colors) {
+        if (!AP_HasItem(GD_GetItemIdForColor(color))) {
+          return kNo;
+        }
       }
     }
-  }
 
-  if (panel_obj.panel_door != -1 && AP_GetDoorShuffleMode() == kPANELS_MODE) {
-    const PanelDoor& panel_door_obj = GD_GetPanelDoor(panel_obj.panel_door);
+    if (panel_obj.panel_door != -1 && AP_GetDoorShuffleMode() == kPANELS_MODE) {
+      const PanelDoor& panel_door_obj = GD_GetPanelDoor(panel_obj.panel_door);
 
-    if (AP_AreDoorsGrouped() && panel_door_obj.group_ap_item_id != -1) {
-      return AP_HasItem(panel_door_obj.group_ap_item_id) ? kYes : kNo;
-    } else {
-      bool has_item = AP_HasItem(panel_door_obj.ap_item_id);
+      if (AP_AreDoorsGrouped() && panel_door_obj.group_ap_item_id != -1) {
+        return AP_HasItem(panel_door_obj.group_ap_item_id) ? kYes : kNo;
+      } else {
+        bool has_item = AP_HasItem(panel_door_obj.ap_item_id);
 
-      if (!has_item) {
-        for (const ProgressiveRequirement& prog_req :
-             panel_door_obj.progressives) {
-          if (AP_HasItem(prog_req.ap_item_id, prog_req.quantity)) {
-            has_item = true;
-            break;
+        if (!has_item) {
+          for (const ProgressiveRequirement& prog_req :
+               panel_door_obj.progressives) {
+            if (AP_HasItem(prog_req.ap_item_id, prog_req.quantity)) {
+              has_item = true;
+              break;
+            }
           }
         }
-      }
 
-      return has_item ? kYes : kNo;
+        return has_item ? kYes : kNo;
+      }
     }
 
     return kYes;
-- 
cgit 1.4.1