From c94b76dcf05d69549fbd133188940d1f621caa7b Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Mon, 11 Jul 2022 16:36:22 +0200
Subject: [PATCH] Minor changes

---
 SKSE/Plugins/ArtifactTracker.dll              | Bin 437248 -> 437248 bytes
 Source/ArtifactTrackerDLL/CMakeLists.txt      |   2 +-
 Source/ArtifactTrackerDLL/cmake/version.rc.in |   4 +++-
 .../src/ArtifactTracker.cpp                   |  13 +++++++------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/SKSE/Plugins/ArtifactTracker.dll b/SKSE/Plugins/ArtifactTracker.dll
index fc82ace616c2e4f6832118b1525ddfe603b482f9..f7e6019d205d861b8a7295a12dfe62fc6c9d14cb 100644
GIT binary patch
delta 2663
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
XeY>g~>l+&ycQiIPwur)=+70+Wu&z*E

delta 2498
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
bj@?3CkGjgbopt-_8ta<t+W3rJ$`<@TkO?kS

diff --git a/Source/ArtifactTrackerDLL/CMakeLists.txt b/Source/ArtifactTrackerDLL/CMakeLists.txt
index 358c2e5..e358768 100644
--- a/Source/ArtifactTrackerDLL/CMakeLists.txt
+++ b/Source/ArtifactTrackerDLL/CMakeLists.txt
@@ -7,7 +7,7 @@ message("Using toolchain file ${CMAKE_TOOLCHAIN_FILE}.")
 project(
         ArtifactTracker
         VERSION 1.0.0
-        DESCRIPTION "Eddoursul's Artifact Tracker"
+        DESCRIPTION "Artifact Tracker"
         LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/Source/ArtifactTrackerDLL/cmake/version.rc.in b/Source/ArtifactTrackerDLL/cmake/version.rc.in
index c0d89e4..93ca658 100644
--- a/Source/ArtifactTrackerDLL/cmake/version.rc.in
+++ b/Source/ArtifactTrackerDLL/cmake/version.rc.in
@@ -17,12 +17,14 @@ BEGIN
 	BEGIN
 		BLOCK "040904b0"
 		BEGIN
+			VALUE "CompanyName", "Eddoursul (www.eddoursul.win)"
 			VALUE "FileDescription", "@PROJECT_DESCRIPTION@"
 			VALUE "FileVersion", "@PROJECT_VERSION@"
 			VALUE "InternalName", "@PROJECT_NAME@"
-			VALUE "LegalCopyright", "MIT License"
+			VALUE "LegalCopyright", "GNU Lesser General Public License"
 			VALUE "ProductName", "@PROJECT_FRIENDLY_NAME@"
 			VALUE "ProductVersion", "@PROJECT_VERSION@"
+			VALUE "OriginalFilename", "@PROJECT_NAME@.dll"
 		END
 	END
 	BLOCK "VarFileInfo"
diff --git a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
index 903729c..2960ce5 100644
--- a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
+++ b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
@@ -34,7 +34,7 @@ namespace ArtifactTracker
 
 		if (!dataHandler) {
 			// Called before kDataLoaded?
-			log::error("RE::TESDataHandler is not initialized.");
+			log::error("DataHandler is not initialized.");
 			return false;
 		}
 
@@ -169,7 +169,8 @@ namespace ArtifactTracker
 			return true;
 		});
 
-		if (g_listStored->forms.size() + g_listFound->forms.size() + g_listNew->forms.size() != g_artifactMap.size()) {
+		std::uint32_t savedCount = g_listStored->forms.size() + g_listFound->forms.size() + g_listNew->forms.size();
+		if (savedCount != g_artifactMap.size()) {
 			log::info("Reverting g_listNew");
 			ListRevert(g_listNew);
 		}
@@ -355,7 +356,7 @@ namespace ArtifactTracker
 		}
 
 		if (cellStorage) {
-			if (!g_persistentStorage->HasForm(cellStorage)) {
+			if (!g_persistentMap.contains(cellStorage->formID)) {
 				g_persistentStorage->AddForm(cellStorage);
 				g_persistentMap[cellStorage->formID] = cellStorage;
 			}
@@ -582,7 +583,7 @@ namespace ArtifactTracker
 					g_listStored->AddForm(form);
 				}
 
-			} else if (a_event->oldContainer == 0x14) {  // dropped, consumed, dismantle, removed by script
+			} else if (a_event->oldContainer == 0x14) {  // dropped, consumed, dismantled, removed by script
 
 				if (!g_listStored->HasForm(form)) {
 					if (!GetItemCount(RE::PlayerCharacter::GetSingleton(), form) && !FollowersHaveItem(form)) {
@@ -649,7 +650,7 @@ namespace ArtifactTracker
 				} else {
 					const auto container = ref->As<RE::TESObjectREFR>();
 					if (container) {
-						if (g_cellStorage && IsInSameCell(container)) {  // deleted from container at home
+						if (g_cellStorage && IsInSameCell(container)) {  // removed from container at home
 
 							if (!GetItemCount(container, form)) {
 								SyncCellStorage(container);
@@ -726,7 +727,7 @@ namespace ArtifactTracker
 
 	void OnLocationChange()
 	{
-		std::uint32_t iCurrentFollowers = 0;
+		std::int32_t iCurrentFollowers = 0;
 
 		for (const auto& actor : GetPlayerFollowers()) {
 			iCurrentFollowers += actor->formID;