From fe427ee1eb5c673e19cead35b4ca1a4c3c4a58d9 Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Thu, 27 May 2021 22:49:03 -0700
Subject: [PATCH] Fix oversight in Connection lists

---
 Runtime/ImGuiEntitySupport.cpp | 90 ++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 42 deletions(-)

diff --git a/Runtime/ImGuiEntitySupport.cpp b/Runtime/ImGuiEntitySupport.cpp
index 903b02418..72a8653c0 100644
--- a/Runtime/ImGuiEntitySupport.cpp
+++ b/Runtime/ImGuiEntitySupport.cpp
@@ -201,28 +201,31 @@ void CEntity::ImGuiInspect() {
       ImGui::TableSetupScrollFreeze(0, 1);
       ImGui::TableHeadersRow();
       for (const auto& item : x20_conns) {
-        const auto uid = g_StateManager->GetIdForScript(item.x8_objId);
-        if (uid == kInvalidUniqueId) {
-          continue;
+        const auto search = g_StateManager->GetIdListForScript(item.x8_objId);
+        for (auto it = search.first; it != search.second; ++it) {
+          const auto uid = it->second;
+          if (uid == kInvalidUniqueId) {
+            continue;
+          }
+          ImGuiEntityEntry& entry = ImGuiConsole::entities[uid.Value()];
+          if (entry.uid == kInvalidUniqueId) {
+            continue;
+          }
+          ImGuiConsole::BeginEntityRow(entry);
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(entry.type);
+          }
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(entry.name);
+          }
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(ScriptObjectStateToStr(item.x0_state));
+          }
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(ScriptObjectMessageToStr(item.x4_msg));
+          }
+          ImGuiConsole::EndEntityRow(entry);
         }
-        ImGuiEntityEntry& entry = ImGuiConsole::entities[uid.Value()];
-        if (entry.uid == kInvalidUniqueId) {
-          continue;
-        }
-        ImGuiConsole::BeginEntityRow(entry);
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(entry.type);
-        }
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(entry.name);
-        }
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(ScriptObjectStateToStr(item.x0_state));
-        }
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(ScriptObjectMessageToStr(item.x4_msg));
-        }
-        ImGuiConsole::EndEntityRow(entry);
       }
       ImGui::EndTable();
     }
@@ -240,28 +243,31 @@ void CEntity::ImGuiInspect() {
       ImGui::TableSetupScrollFreeze(0, 1);
       ImGui::TableHeadersRow();
       for (const auto& item : *m_incomingConnections) {
-        const auto uid = g_StateManager->GetIdForScript(item.x8_objId);
-        if (uid == kInvalidUniqueId) {
-          continue;
+        const auto search = g_StateManager->GetIdListForScript(item.x8_objId);
+        for (auto it = search.first; it != search.second; ++it) {
+          auto uid = it->second;
+          if (uid == kInvalidUniqueId) {
+            continue;
+          }
+          ImGuiEntityEntry& entry = ImGuiConsole::entities[uid.Value()];
+          if (entry.uid == kInvalidUniqueId) {
+            continue;
+          }
+          ImGuiConsole::BeginEntityRow(entry);
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(entry.type);
+          }
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(entry.name);
+          }
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(ScriptObjectStateToStr(item.x0_state));
+          }
+          if (ImGui::TableNextColumn()) {
+            ImGuiStringViewText(ScriptObjectMessageToStr(item.x4_msg));
+          }
+          ImGuiConsole::EndEntityRow(entry);
         }
-        ImGuiEntityEntry& entry = ImGuiConsole::entities[uid.Value()];
-        if (entry.uid == kInvalidUniqueId) {
-          continue;
-        }
-        ImGuiConsole::BeginEntityRow(entry);
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(entry.type);
-        }
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(entry.name);
-        }
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(ScriptObjectStateToStr(item.x0_state));
-        }
-        if (ImGui::TableNextColumn()) {
-          ImGuiStringViewText(ScriptObjectMessageToStr(item.x4_msg));
-        }
-        ImGuiConsole::EndEntityRow(entry);
       }
       ImGui::EndTable();
     }