feat: shared_ptr: familiar, groups and reload: familiars, outfits (#2556

)

CMakePresets.json

@@ -54,6 +54,7 @@
         "DEBUG_LOG": "ON",
         "ASAN_ENABLED": "OFF",
         "BUILD_STATIC_LIBRARY": "OFF",
+        "SPEED_UP_BUILD_UNITY": "OFF",
         "VCPKG_TARGET_TRIPLET": "x64-windows"
       }
     },

data/scripts/talkactions/god/reload.lua

@@ -7,6 +7,7 @@ local reloadTypes = {
 	["configuration"] = RELOAD_TYPE_CONFIG,
 	["core"] = RELOAD_TYPE_CORE,
 	["events"] = RELOAD_TYPE_EVENTS,
+	["familiar"] = RELOAD_TYPE_FAMILIARS,
 	["global"] = RELOAD_TYPE_CORE,
 	["group"] = RELOAD_TYPE_GROUPS,
 	["groups"] = RELOAD_TYPE_GROUPS,
@@ -20,6 +21,8 @@ local reloadTypes = {
 	["monsters"] = RELOAD_TYPE_MONSTERS,
 	["mount"] = RELOAD_TYPE_MOUNTS,
 	["mounts"] = RELOAD_TYPE_MOUNTS,
+	["outfit"] = RELOAD_TYPE_OUTFITS,
+	["outfits"] = RELOAD_TYPE_OUTFITS,
 	["npc"] = RELOAD_TYPE_NPCS,
 	["npcs"] = RELOAD_TYPE_NPCS,
 	["raid"] = RELOAD_TYPE_RAIDS,

src/creatures/appearance/mounts/mounts.cpp

@@ -29,7 +29,7 @@ bool Mounts::loadFromXml() {
 	}
 
 	for (auto mountNode : doc.child("mounts").children()) {
-		uint16_t lookType = pugi::cast<uint16_t>(mountNode.attribute("clientid").value());
+		auto lookType = pugi::cast<uint16_t>(mountNode.attribute("clientid").value());
 		if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 && !g_game().isLookTypeRegistered(lookType)) {
 			g_logger().warn("{} - An unregistered creature mount with id '{}' was blocked to prevent client crash.", __FUNCTION__, lookType);
 			continue;

src/creatures/appearance/outfit/outfit.cpp

@@ -14,6 +14,10 @@
 #include "utils/tools.hpp"
 #include "game/game.hpp"
 
+Outfits &Outfits::getInstance() {
+	return inject<Outfits>();
+}
+
 bool Outfits::reload() {
 	for (auto &outfitsVector : outfits) {
 		outfitsVector.clear();
@@ -41,7 +45,7 @@ bool Outfits::loadFromXml() {
 			continue;
 		}
 
-		uint16_t type = pugi::cast<uint16_t>(attr.value());
+		auto type = pugi::cast<uint16_t>(attr.value());
 		if (type > PLAYERSEX_LAST) {
 			g_logger().warn("[Outfits::loadFromXml] - Invalid outfit type {}", type);
 			continue;
@@ -53,7 +57,7 @@ bool Outfits::loadFromXml() {
 			continue;
 		}
 
-		if (uint16_t lookType = pugi::cast<uint16_t>(lookTypeAttribute.value());
+		if (auto lookType = pugi::cast<uint16_t>(lookTypeAttribute.value());
 			g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0
 			&& !g_game().isLookTypeRegistered(lookType)) {
 			g_logger().warn("[Outfits::loadFromXml] An unregistered creature looktype type with id '{}' was ignored to prevent client crash.", lookType);
@@ -74,7 +78,22 @@ bool Outfits::loadFromXml() {
 	return true;
 }
 
-std::shared_ptr<Outfit> Outfits::getOutfitByLookType(PlayerSex_t sex, uint16_t lookType) 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;
+	}
+
+	auto sex = player->getSex();
+	if (sex != PLAYERSEX_FEMALE && sex != PLAYERSEX_MALE) {
+		g_logger().error("[{}] - Sex invalid or player: {}", __FUNCTION__, player->getName());
+		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;
 	});
@@ -84,15 +103,3 @@ std::shared_ptr<Outfit> Outfits::getOutfitByLookType(PlayerSex_t sex, uint16_t l
 	}
 	return nullptr;
 }
-
-/**
- * Get the oposite sex equivalent outfit
- * @param sex current sex
- * @param lookType current looktype
- * @return <b>const</b> pointer to the outfit or <b>nullptr</b> if it could not be found.
- */
-
-std::shared_ptr<Outfit> Outfits::getOpositeSexOutfitByLookType(PlayerSex_t sex, uint16_t lookType) const {
-	PlayerSex_t searchSex = (sex == PLAYERSEX_MALE) ? PLAYERSEX_FEMALE : PLAYERSEX_MALE;
-	return getOutfitByLookType(searchSex, lookType);
-}

src/creatures/appearance/outfit/outfit.hpp

@@ -12,8 +12,10 @@
 #include "declarations.hpp"
 #include "lib/di/container.hpp"
 
+class Player;
+
 struct OutfitEntry {
-	constexpr OutfitEntry(uint16_t initLookType, uint8_t initAddons) :
+	constexpr explicit OutfitEntry(uint16_t initLookType, uint8_t initAddons) :
 		lookType(initLookType), addons(initAddons) { }
 
 	uint16_t lookType;
@@ -42,16 +44,12 @@ struct ProtocolOutfit {
 
 class Outfits {
 public:
-	static Outfits &getInstance() {
-		return inject<Outfits>();
-	}
-
-	std::shared_ptr<Outfit> getOpositeSexOutfitByLookType(PlayerSex_t sex, uint16_t lookType) const;
+	static Outfits &getInstance();
 
-	bool loadFromXml();
 	bool reload();
+	bool loadFromXml();
 
-	[[nodiscard]] std::shared_ptr<Outfit> getOutfitByLookType(PlayerSex_t sex, uint16_t lookType) 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];
 	}

src/creatures/players/grouping/familiars.cpp

@@ -10,10 +10,15 @@
 #include "pch.hpp"
 
 #include "creatures/players/grouping/familiars.hpp"
+#include "lib/di/container.hpp"
 #include "config/configmanager.hpp"
 #include "utils/pugicast.hpp"
 #include "utils/tools.hpp"
 
+Familiars &Familiars::getInstance() {
+	return inject<Familiars>();
+}
+
 bool Familiars::reload() {
 	for (auto &familiarsVector : familiars) {
 		familiarsVector.clear();
@@ -42,7 +47,7 @@ bool Familiars::loadFromXml() {
 			continue;
 		}
 
-		uint16_t vocation = pugi::cast<uint16_t>(attr.value());
+		auto vocation = pugi::cast<uint16_t>(attr.value());
 		if (vocation > VOCATION_LAST) {
 			g_logger().warn("[Familiars::loadFromXml] - Invalid familiar vocation {}", vocation);
 			continue;

src/creatures/players/grouping/familiars.hpp

@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "declarations.hpp"
 #include "lib/di/container.hpp"
 
 struct FamiliarEntry {
@@ -32,9 +33,7 @@ struct Familiar {
 
 class Familiars {
 public:
-	static Familiars &getInstance() {
-		return inject<Familiars>();
-	}
+	static Familiars &getInstance();
 
 	bool loadFromXml();
 	bool reload();

src/creatures/players/grouping/groups.cpp

@@ -43,7 +43,7 @@ PlayerFlags_t Groups::getFlagFromNumber(uint8_t value) {
 	return magic_enum::enum_value<PlayerFlags_t>(value);
 }
 
-bool Groups::reload() const {
+bool Groups::reload() {
 	// Clear groups
 	g_game().groups.getGroups().clear();
 	return g_game().groups.load();
@@ -99,7 +99,7 @@ bool Groups::load() {
 	return true;
 }
 
-std::shared_ptr<Group> Groups::getGroup(uint16_t id) {
+std::shared_ptr<Group> Groups::getGroup(uint16_t id) const {
 	if (auto it = std::find_if(groups_vector.begin(), groups_vector.end(), [id](auto group_it) {
 			return group_it->id == id;
 		});

src/creatures/players/grouping/groups.hpp

@@ -24,9 +24,9 @@ class Groups {
 public:
 	static uint8_t getFlagNumber(PlayerFlags_t playerFlags);
 	static PlayerFlags_t getFlagFromNumber(uint8_t value);
-	bool reload() const;
+	static bool reload();
 	bool load();
-	std::shared_ptr<Group> getGroup(uint16_t id);
+	[[nodiscard]] std::shared_ptr<Group> getGroup(uint16_t id) const;
 	std::vector<std::shared_ptr<Group>> &getGroups() {
 		return groups_vector;
 	}

src/creatures/players/player.cpp

@@ -4914,7 +4914,7 @@ bool Player::canWear(uint16_t lookType, uint8_t addons) const {
 		return true;
 	}
 
-	const auto &outfit = Outfits::getInstance().getOutfitByLookType(sex, lookType);
+	const auto &outfit = Outfits::getInstance().getOutfitByLookType(getPlayer(), lookType);
 	if (!outfit) {
 		return false;
 	}
@@ -5001,7 +5001,7 @@ bool Player::removeOutfitAddon(uint16_t lookType, uint8_t addons) {
 	return false;
 }
 
-bool Player::getOutfitAddons(const std::shared_ptr<Outfit> outfit, uint8_t &addons) const {
+bool Player::getOutfitAddons(const std::shared_ptr<Outfit> &outfit, uint8_t &addons) const {
 	if (group->access) {
 		addons = 3;
 		return true;
@@ -5826,7 +5826,7 @@ bool Player::toggleMount(bool mount) {
 			return false;
 		}
 
-		const auto &playerOutfit = Outfits::getInstance().getOutfitByLookType(getSex(), defaultOutfit.lookType);
+		const auto &playerOutfit = Outfits::getInstance().getOutfitByLookType(getPlayer(), defaultOutfit.lookType);
 		if (!playerOutfit) {
 			return false;
 		}

src/creatures/players/player.hpp

@@ -476,7 +476,12 @@ class Player final : public Creature, public Cylinder, public Bankable {
 		return blessings[index - 1] != 0;
 	}
 	uint8_t getBlessingCount(uint8_t index) const {
-		return blessings[index - 1];
+		if (index > 0 && index <= blessings.size()) {
+			return blessings[index - 1];
+		} else {
+			g_logger().error("[{}] - index outside range 0-10.", __FUNCTION__);
+			return 0;
+		}
 	}
 	std::string getBlessingsName() const;
 
@@ -1031,7 +1036,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	void addOutfit(uint16_t lookType, uint8_t addons);
 	bool removeOutfit(uint16_t lookType);
 	bool removeOutfitAddon(uint16_t lookType, uint8_t addons);
-	bool getOutfitAddons(const std::shared_ptr<Outfit> outfit, uint8_t &addons) const;
+	bool getOutfitAddons(const std::shared_ptr<Outfit> &outfit, uint8_t &addons) const;
 
 	bool canFamiliar(uint16_t lookType) const;
 	void addFamiliar(uint16_t lookType);
@@ -2853,7 +2858,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
 
 	uint16_t lastStatsTrainingTime = 0;
 	uint16_t staminaMinutes = 2520;
-	std::vector<uint8_t> blessings = { 0, 0, 0, 0, 0, 0, 0, 0 };
+	std::vector<uint8_t> blessings = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	uint16_t maxWriteLen = 0;
 	uint16_t baseXpGain = 100;
 	uint16_t voucherXpBoost = 0;