Fix #268

R3nzTheCodeGOD · Nov 22, 2022 · e27e23d · e27e23d
1 parent 1765c2e
commit e27e23d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/R3nzSkin/Hooks.cpp b/R3nzSkin/Hooks.cpp
@@ -416,13 +416,6 @@ void Hooks::init() noexcept
 
 		const auto hash{ fnv::hash_runtime(minion->get_character_data_stack()->base_skin.model.str) };
 
-		if (minion->isJungle()) {
-			const auto config_entry{ cheatManager.config->current_combo_jungle_mob_skin_index.find(hash) };
-			if (config_entry != cheatManager.config->current_combo_jungle_mob_skin_index.end() && config_entry->second != 0)
-				changeSkinForObject(minion, config_entry->second - 1);
-			continue;
-		}
-
 		if (const auto owner{ minion->getGoldRedirectTarget() }; owner) {
 			if (hash == FNV("JammerDevice") || hash == FNV("SightWard") || hash == FNV("YellowTrinket") || hash == FNV("VisionWard") || hash == FNV("BlueTrinket") || hash == FNV("TestCubeRender10Vision")) {
 				if (!player || owner == player) {
@@ -438,6 +431,11 @@ void Hooks::init() noexcept
 			continue;
 		}
 
+		if (const auto config_entry{ cheatManager.config->current_combo_jungle_mob_skin_index.find(hash) }; config_entry != cheatManager.config->current_combo_jungle_mob_skin_index.end() && config_entry->second != 0) {
+			changeSkinForObject(minion, config_entry->second - 1);
+			continue;
+		}
+
 		// Just LocalPlayer
 		if ((hash == FNV("NunuSnowball") && playerHash == FNV("Nunu")) || (hash == FNV("KindredWolf") && playerHash == FNV("Kindred")) || (hash == FNV("QuinnValor") && playerHash == FNV("Quinn")))
 			changeSkinForObject(minion, player->get_character_data_stack()->base_skin.skin);

diff --git a/R3nzSkin/SDK/GameObject.hpp b/R3nzSkin/SDK/GameObject.hpp
@@ -12,10 +12,18 @@ class GameObject {
 	CLASS_GETTER_P(std::string, get_name, offsets::GameObject::Name)
 	CLASS_GETTER(std::int32_t, get_team, offsets::GameObject::Team)
 
-
+	// Returns true for lane minions.
 	[[nodiscard]] bool isLaneMinion() const noexcept { return invoker.invokeThiscall<bool, offsets::GameObject::VTable::IsLaneMinion>(std::uintptr_t(this)); }
+
+	// Returns true for blue, red and crab.
 	[[nodiscard]] bool isEliteMinion() const noexcept { return invoker.invokeThiscall<bool, offsets::GameObject::VTable::IsEliteMinion>(std::uintptr_t(this)); }
+
+	// Returns true for dragon, baron, and rift.
 	[[nodiscard]] bool isEpicMinion() const noexcept { return invoker.invokeThiscall<bool, offsets::GameObject::VTable::IsEpicMinion>(std::uintptr_t(this)); }
+
+	// Returns true for minion.
 	[[nodiscard]] bool isMinion() const noexcept { return invoker.invokeThiscall<bool, offsets::GameObject::VTable::IsMinion>(std::uintptr_t(this)); }
+
+	// Returns true for objects that both teams can damage, such as jungle objects, gangplain barrels, etc.
 	[[nodiscard]] bool isJungle() const noexcept { return invoker.invokeThiscall<bool, offsets::GameObject::VTable::IsJungle>(std::uintptr_t(this)); }
 };