Allow disabling icon colors in inventory menus

Fuzzlesz · Feb 22, 2023 · 610abdd · 610abdd
1 parent 09468d1
commit 610abdd
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 41 deletions.
diff --git a/src/Data/CustomDataManager.cpp b/src/Data/CustomDataManager.cpp
@@ -94,7 +94,7 @@ namespace Data
 			rule.SetInfo(a_entryObject, needsIconUpdate);
 		}
 
-		if (needsIconUpdate) {
+		if (needsIconUpdate && a_processIconCallback) {
 			a_processIconCallback(a_entryObject);
 		}
 

diff --git a/src/Hooks/FavoritesListEntry.cpp b/src/Hooks/FavoritesListEntry.cpp
@@ -66,32 +66,7 @@ namespace Hooks
 			return;
 		}
 
-		// Favorites menu icons are offset by (64, 64) compared to icon swf
-		// Icon sprite also has a transform, which might vary depending on mods
-		if (!a_params.thisPtr->HasMember("_iconPosFixed")) {
-			RE::GFxValue transform;
-			itemIcon.GetMember("transform", &transform);
-
-			if (transform.IsObject()) {
-				RE::GFxValue matrix;
-				transform.GetMember("matrix", &matrix);
-
-				if (matrix.IsObject()) {
-					RE::GFxValue sx, sy;
-					matrix.GetMember("a", &sx);
-					matrix.GetMember("d", &sy);
-
-					if (sx.IsNumber() && sy.IsNumber()) {
-						std::array<RE::GFxValue, 2>
-							args{ -64.0 * sx.GetNumber(), -64.0 * sy.GetNumber() };
-						matrix.Invoke("translate", args);
-
-						transform.SetMember("matrix", matrix);
-						a_params.thisPtr->SetMember("_iconPosFixed", true);
-					}
-				}
-			}
-		}
+		FixIconPos(a_params.thisPtr, itemIcon);
 
 		// We are overriding the embedded icons in the movie
 		const char* source = "skyui/icons_item_psychosteve.swf";
@@ -171,6 +146,44 @@ namespace Hooks
 		ChangeIconColor(a_icon, iconColor);
 	}
 
+	void FavoritesListEntry::FixIconPos(RE::GFxValue* a_thisPtr, RE::GFxValue& a_icon)
+	{
+		assert(a_thisPtr);
+		assert(a_icon.IsDisplayObject());
+
+		// Favorites menu icons are offset by (64, 64) compared to icon swf
+		// Icon sprite also has a transform, which might vary depending on mods
+		if (a_thisPtr->HasMember("_iconPosFixed")) {
+			return;
+		}
+
+		RE::GFxValue transform;
+		a_icon.GetMember("transform", &transform);
+
+		if (!transform.IsObject()) {
+			return;
+		}
+
+		RE::GFxValue matrix;
+		transform.GetMember("matrix", &matrix);
+
+		if (!matrix.IsObject()) {
+			return;
+		}
+
+		RE::GFxValue sx, sy;
+		matrix.GetMember("a", &sx);
+		matrix.GetMember("d", &sy);
+
+		if (sx.IsNumber() && sy.IsNumber()) {
+			std::array<RE::GFxValue, 2> args{ -64.0 * sx.GetNumber(), -64.0 * sy.GetNumber() };
+			matrix.Invoke("translate", args);
+
+			transform.SetMember("matrix", matrix);
+			a_thisPtr->SetMember("_iconPosFixed", true);
+		}
+	}
+
 	void FavoritesListEntry::ChangeIconColor(const RE::GFxValue& a_icon, const RE::GFxValue& a_rgb)
 	{
 		if (!a_icon.IsDisplayObject()) {

diff --git a/src/Hooks/FavoritesListEntry.h b/src/Hooks/FavoritesListEntry.h
@@ -27,6 +27,8 @@ namespace Hooks
 			void Call(Params& a_params) override;
 		};
 
+		static void FixIconPos(RE::GFxValue* a_thisPtr, RE::GFxValue& a_icon);
+
 		static void ChangeIconColor(const RE::GFxValue& a_icon, const RE::GFxValue& a_rgb);
 
 		static RE::GRenderer::Cxform GetColorTransform(std::uint32_t a_rgb);

diff --git a/src/Hooks/IconSetter.cpp b/src/Hooks/IconSetter.cpp
@@ -43,12 +43,14 @@ namespace Hooks
 			a_list.GetMember("_entryList", &entryList);
 		}
 
-		if (entryList.IsArray()) {
-			for (std::uint32_t i = 0, size = entryList.GetArraySize(); i < size; i++) {
-				RE::GFxValue entryObject;
-				entryList.GetElement(i, &entryObject);
-				ModifyObject(a_params.movie, entryObject);
-			}
+		if (!entryList.IsArray()) {
+			return;
+		}
+
+		for (std::uint32_t i = 0, size = entryList.GetArraySize(); i < size; i++) {
+			RE::GFxValue entryObject;
+			entryList.GetElement(i, &entryObject);
+			ModifyObject(a_params.movie, entryObject);
 		}
 
 		if (_oldFunc.IsObject()) {
@@ -59,23 +61,47 @@ namespace Hooks
 				static_cast<std::size_t>(a_params.argCount) + 1);
 		}
 
-		if (entryList.IsArray()) {
-			for (std::uint32_t i = 0, size = entryList.GetArraySize(); i < size; i++) {
-				RE::GFxValue entryObject;
-				entryList.GetElement(i, &entryObject);
-				if (entryObject.IsObject()) {
-					ProcessEntry(a_params.thisPtr, &entryObject);
+		RE::GFxValue _noIconColors;
+		a_params.thisPtr->GetMember("_noIconColors", &_noIconColors);
+		bool noIconColors = _noIconColors.IsBool() && _noIconColors.GetBool();
+		RE::GFxValue defaultColor;
+
+		if (noIconColors) {
+			RE::GFxValue dummy;
+			a_params.movie->CreateObject(&dummy);
+
+			auto dataManager = Data::CustomDataManager::GetSingleton();
+			dataManager->ProcessEntry(&dummy, {});
+
+			dummy.GetMember("iconColor", &defaultColor);
+		}
+
+		for (std::uint32_t i = 0, size = entryList.GetArraySize(); i < size; i++) {
+			RE::GFxValue entryObject;
+			entryList.GetElement(i, &entryObject);
+			if (!entryObject.IsObject()) {
+				continue;
+			}
+
+			ProcessEntry(a_params.thisPtr, &entryObject);
+
+			if (noIconColors && entryObject.HasMember("iconColor")) {
+				if (defaultColor.IsUndefined()) {
+					entryObject.DeleteMember("iconColor");
+				}
+				else {
+					entryObject.SetMember("iconColor", defaultColor);
 				}
 			}
 		}
 	}
 
 	void IconSetter::ProcessEntry(RE::GFxValue* a_thisPtr, RE::GFxValue* a_entryObject)
 	{
-		const auto inventoryManager = Data::CustomDataManager::GetSingleton();
+		const auto dataManager = Data::CustomDataManager::GetSingleton();
 
 		auto processIconCallback = std::bind_front(&ProcessIconInternal, a_thisPtr);
-		inventoryManager->ProcessEntry(a_entryObject, processIconCallback);
+		dataManager->ProcessEntry(a_entryObject, processIconCallback);
 	}
 
 	void IconSetter::ProcessIconInternal(RE::GFxValue* a_thisPtr, RE::GFxValue* a_entryObject)