improvement of 'getOutfitByLookType' function, and recovered function…

… 'getOpositeSexOutfitByLookType'.
opentibiabr · May 15, 2024 · 61110bc · 61110bc
1 parent 63c43f5
commit 61110bc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/src/creatures/appearance/outfit/outfit.cpp b/src/creatures/appearance/outfit/outfit.cpp
@@ -78,7 +78,7 @@ bool Outfits::loadFromXml() {
 	return true;
 }
 
-std::shared_ptr<Outfit> Outfits::getOutfitByLookType(uint16_t lookType, const std::shared_ptr<const Player> &player) const {
+std::shared_ptr<Outfit> Outfits::getOutfitByLookType(const std::shared_ptr<const Player> &player, uint16_t lookType, bool isOppositeOutfit) const {
 	if (!player) {
 		g_logger().error("[{}] - Player not found", __FUNCTION__);
 		return nullptr;
@@ -90,6 +90,10 @@ std::shared_ptr<Outfit> Outfits::getOutfitByLookType(uint16_t lookType, const st
 		return nullptr;
 	}
 
+	if (isOppositeOutfit) {
+		sex = (sex == PLAYERSEX_MALE) ? PLAYERSEX_FEMALE : PLAYERSEX_MALE;
+	}
+
 	auto it = std::ranges::find_if(outfits[sex], [&lookType](const auto &outfit) {
 		return outfit->lookType == lookType;
 	});

diff --git a/src/creatures/appearance/outfit/outfit.hpp b/src/creatures/appearance/outfit/outfit.hpp
@@ -49,7 +49,7 @@ class Outfits {
 	bool reload();
 	bool loadFromXml();
 
-	[[nodiscard]] std::shared_ptr<Outfit> getOutfitByLookType(uint16_t lookType, const std::shared_ptr<const Player> &player) const;
+	[[nodiscard]] std::shared_ptr<Outfit> getOutfitByLookType(const std::shared_ptr<const Player> &player, uint16_t lookType, bool isOppositeOutfit = false) const;
 	[[nodiscard]] const std::vector<std::shared_ptr<Outfit>> &getOutfits(PlayerSex_t sex) const {
 		return outfits[sex];
 	}

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -4982,7 +4982,7 @@ bool Player::canWear(uint16_t lookType, uint8_t addons) const {
 		return true;
 	}
 
-	const auto &outfit = Outfits::getInstance().getOutfitByLookType(lookType, getPlayer());
+	const auto &outfit = Outfits::getInstance().getOutfitByLookType(getPlayer(), lookType);
 	if (!outfit) {
 		return false;
 	}
@@ -5894,7 +5894,7 @@ bool Player::toggleMount(bool mount) {
 			return false;
 		}
 
-		const auto &playerOutfit = Outfits::getInstance().getOutfitByLookType(defaultOutfit.lookType, getPlayer());
+		const auto &playerOutfit = Outfits::getInstance().getOutfitByLookType(getPlayer(), defaultOutfit.lookType);
 		if (!playerOutfit) {
 			return false;
 		}

diff --git a/src/game/functions/game_reload.cpp b/src/game/functions/game_reload.cpp
@@ -222,5 +222,5 @@ bool GameReload::reloadFamiliars() {
 bool GameReload::reloadVocations() {
 	const bool result = g_vocations().reload();
 	logReloadStatus("Vocations", result);
-	return result;
+	return result && reloadScripts();
 }
diff --git a/src/game/functions/game_reload.hpp b/src/game/functions/game_reload.hpp
@@ -16,6 +16,8 @@ class Game;
 enum class Reload_t : uint8_t {
 	RELOAD_TYPE_NONE,
 	RELOAD_TYPE_ALL,
+	RELOAD_TYPE_VOCATIONS,
+	RELOAD_TYPE_SCRIPTS,
 	RELOAD_TYPE_CHAT,
 	RELOAD_TYPE_CONFIG,
 	RELOAD_TYPE_EVENTS,
@@ -28,10 +30,8 @@ enum class Reload_t : uint8_t {
 	RELOAD_TYPE_OUTFITS,
 	RELOAD_TYPE_NPCS,
 	RELOAD_TYPE_RAIDS,
-	RELOAD_TYPE_SCRIPTS,
 	RELOAD_TYPE_GROUPS,
 	RELOAD_TYPE_FAMILIARS,
-	RELOAD_TYPE_VOCATIONS,
 
 	// Every is last
 	RELOAD_TYPE_LAST

diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -4257,7 +4257,7 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos
 		name << item->getName() << " displaying the ";
 		bool outfited = false;
 		if (outfit.lookType != 0) {
-			const auto &outfitInfo = Outfits::getInstance().getOutfitByLookType(outfit.lookType, player);
+			const auto &outfitInfo = Outfits::getInstance().getOutfitByLookType(player, outfit.lookType);
 			if (!outfitInfo) {
 				return;
 			}
@@ -5906,7 +5906,7 @@ void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMoun
 		outfit.lookMount = randomMount->clientId;
 	}
 
-	const auto playerOutfit = Outfits::getInstance().getOutfitByLookType(outfit.lookType, player);
+	const auto playerOutfit = Outfits::getInstance().getOutfitByLookType(player, outfit.lookType);
 	if (!playerOutfit) {
 		outfit.lookMount = 0;
 	}

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -4020,7 +4020,7 @@ void ProtocolGame::sendCyclopediaCharacterInspection() {
 	// Outfit description
 	playerDescriptionSize++;
 	msg.addString("Outfit", "ProtocolGame::sendCyclopediaCharacterInspection - Outfit");
-	if (const auto outfit = Outfits::getInstance().getOutfitByLookType(player->getDefaultOutfit().lookType, player)) {
+	if (const auto outfit = Outfits::getInstance().getOutfitByLookType(player, player->getDefaultOutfit().lookType)) {
 		msg.addString(outfit->name, "ProtocolGame::sendCyclopediaCharacterInspection - outfit->name");
 	} else {
 		msg.addString("unknown", "ProtocolGame::sendCyclopediaCharacterInspection - unknown");