diff --git a/arcdps_collector/arcdps_collector.vcxproj b/arcdps_collector/arcdps_collector.vcxproj index 995f77d..73bdb34 100644 --- a/arcdps_collector/arcdps_collector.vcxproj +++ b/arcdps_collector/arcdps_collector.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/arcdps_mock/CombatMock.cpp b/arcdps_mock/CombatMock.cpp index 8503cd3..9bb0b41 100644 --- a/arcdps_mock/CombatMock.cpp +++ b/arcdps_mock/CombatMock.cpp @@ -297,7 +297,9 @@ void CombatMock::Execute() ag destination = {}; FillAgentEvent(agent, mySelfId, source, destination); - source.prof = static_cast(1); // indicates this is an agent registration event + if (!agent.removed) { + source.prof = static_cast(1); // indicates this is an agent registration event + } source.elite = 0; // indicates this is an agent registration event if (myCallbacks->combat != nullptr) @@ -370,6 +372,7 @@ void CombatMock::Execute() { combatEvent.dst_agent = destinationAgent->UniqueId; combatEvent.dst_instid = destinationAgent->InstanceId; + } else { @@ -961,6 +964,8 @@ void CombatMock::DisplayAgents() ImGui::TableNextColumn(); if (ImGui::SmallButton("remove") == true) { + iter->removed = true; + Execute(); iter = myAgents.erase(iter); } else diff --git a/arcdps_mock/CombatMock.h b/arcdps_mock/CombatMock.h index 8d6afca..d27a80f 100644 --- a/arcdps_mock/CombatMock.h +++ b/arcdps_mock/CombatMock.h @@ -22,6 +22,7 @@ class CombatMock uint64_t UniqueId = 0; uint16_t InstanceId = 0; + bool removed = false; }; enum class CombatEventType : int diff --git a/arcdps_mock/arcdps_mock.vcxproj b/arcdps_mock/arcdps_mock.vcxproj index 1419276..d06e1ab 100644 --- a/arcdps_mock/arcdps_mock.vcxproj +++ b/arcdps_mock/arcdps_mock.vcxproj @@ -21,13 +21,13 @@ Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode