From 6d838f66b89b79aabebcefd19d39edc2d52432a3 Mon Sep 17 00:00:00 2001 From: alhazmy13 Date: Sat, 24 Dec 2022 19:46:41 +0300 Subject: [PATCH 1/2] fix #15 --- arcdps_collector/arcdps_collector.vcxproj | 6 +++--- arcdps_mock/CombatMock.cpp | 7 ++++++- arcdps_mock/CombatMock.h | 1 + arcdps_mock/arcdps_mock.vcxproj | 4 ++-- arcdps_mock/arcdps_mock.vcxproj.user | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) 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 diff --git a/arcdps_mock/arcdps_mock.vcxproj.user b/arcdps_mock/arcdps_mock.vcxproj.user index 5b5d91e..015e91c 100644 --- a/arcdps_mock/arcdps_mock.vcxproj.user +++ b/arcdps_mock/arcdps_mock.vcxproj.user @@ -4,12 +4,12 @@ true - "D:\Guild Wars 2\bin64\d3d9_arcdps_killproof_me.dll" -dx11 + "C:\Users\me\projects\arcdps-squad-notes-plugin\x64\Release\d3d9_arcdps_squad_notes.dll" -dx11 WindowsLocalDebugger $(TargetDir) - "D:\Guild Wars 2\bin64\d3d9_arcdps_killproof_me.dll" -dx11 + "C:\Users\me\projects\arcdps-squad-notes-plugin\x64\Debug\d3d9_arcdps_squad_notes.dll" -dx11 WindowsLocalDebugger $(TargetDir) From 9272fa903601df05ef2c926bf0d03c41e133e37a Mon Sep 17 00:00:00 2001 From: alhazmy13 Date: Sat, 24 Dec 2022 20:27:36 +0300 Subject: [PATCH 2/2] fix #15 --- arcdps_mock/arcdps_mock.vcxproj.user | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arcdps_mock/arcdps_mock.vcxproj.user b/arcdps_mock/arcdps_mock.vcxproj.user index 015e91c..5b5d91e 100644 --- a/arcdps_mock/arcdps_mock.vcxproj.user +++ b/arcdps_mock/arcdps_mock.vcxproj.user @@ -4,12 +4,12 @@ true - "C:\Users\me\projects\arcdps-squad-notes-plugin\x64\Release\d3d9_arcdps_squad_notes.dll" -dx11 + "D:\Guild Wars 2\bin64\d3d9_arcdps_killproof_me.dll" -dx11 WindowsLocalDebugger $(TargetDir) - "C:\Users\me\projects\arcdps-squad-notes-plugin\x64\Debug\d3d9_arcdps_squad_notes.dll" -dx11 + "D:\Guild Wars 2\bin64\d3d9_arcdps_killproof_me.dll" -dx11 WindowsLocalDebugger $(TargetDir)