fix: revert from phmap btree to std functions (#1477)

We found potential issues that could occur (from crashing to things not working) because of this change. So we decided to roll back and change little by little (where and when needed). Revert from: #1376
opentibiabr · Aug 22, 2023 · 88a39f3 · 88a39f3
1 parent 691898a
commit 88a39f3
Show file tree

Hide file tree

Showing 66 changed files with 216 additions and 216 deletions.
diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp
@@ -909,8 +909,8 @@ void Combat::doChainEffect(const Position &origin, const Position &dest, uint8_t
 
 bool Combat::doCombatChain(Creature* caster, Creature* target, bool aggressive) const {
 	auto targets = std::vector<Creature*>();
-	auto targetSet = phmap::btree_set<uint32_t>();
-	auto visitedChain = phmap::btree_set<uint32_t>();
+	auto targetSet = std::set<uint32_t>();
+	auto visitedChain = std::set<uint32_t>();
 	if (target != nullptr) {
 		targets.push_back(target);
 		targetSet.insert(target->getID());
@@ -1372,7 +1372,7 @@ void Combat::setRuneSpellName(const std::string &value) {
 	runeSpellName = value;
 }
 
-void Combat::pickChainTargets(Creature* caster, std::vector<Creature*> &targets, phmap::btree_set<uint32_t> &targetSet, phmap::btree_set<uint32_t> &visited, const CombatParams &params, uint8_t chainDistance, uint8_t maxTargets, bool backtracking, bool aggressive) {
+void Combat::pickChainTargets(Creature* caster, std::vector<Creature*> &targets, std::set<uint32_t> &targetSet, std::set<uint32_t> &visited, const CombatParams &params, uint8_t chainDistance, uint8_t maxTargets, bool backtracking, bool aggressive) {
 	if (maxTargets == 0 || targets.size() > maxTargets) {
 		return;
 	}

diff --git a/src/creatures/combat/combat.hpp b/src/creatures/combat/combat.hpp
@@ -217,7 +217,7 @@ class AreaCombat {
 		return it->second;
 	}
 
-	phmap::btree_map<Direction, MatrixArea*> areas;
+	std::map<Direction, MatrixArea*> areas;
 	bool hasExtArea = false;
 };
 
@@ -297,7 +297,7 @@ class Combat {
 
 private:
 	static void doChainEffect(const Position &origin, const Position &pos, uint8_t effect);
-	static void pickChainTargets(Creature* caster, std::vector<Creature*> &targets, phmap::btree_set<uint32_t> &targetSet, phmap::btree_set<uint32_t> &visited, const CombatParams &params, uint8_t chainDistance, uint8_t maxTargets, bool backtracking, bool aggressive);
+	static void pickChainTargets(Creature* caster, std::vector<Creature*> &targets, std::set<uint32_t> &targetSet, std::set<uint32_t> &visited, const CombatParams &params, uint8_t chainDistance, uint8_t maxTargets, bool backtracking, bool aggressive);
 
 	static void doCombatDefault(Creature* caster, Creature* target, const CombatParams &params);
 

diff --git a/src/creatures/combat/spells.cpp b/src/creatures/combat/spells.cpp
@@ -135,7 +135,7 @@ bool Spells::registerRuneLuaEvent(const std::shared_ptr<RuneSpell> &rune) {
 std::list<uint16_t> Spells::getSpellsByVocation(uint16_t vocationId) {
 	std::list<uint16_t> spellsList;
 	VocSpellMap vocSpells;
-	phmap::btree_map<uint16_t, bool>::const_iterator vocSpellsIt;
+	std::map<uint16_t, bool>::const_iterator vocSpellsIt;
 
 	for (const auto &it : instants) {
 		vocSpells = it.second->getVocMap();

diff --git a/src/creatures/combat/spells.hpp b/src/creatures/combat/spells.hpp
@@ -20,7 +20,7 @@ class InstantSpell;
 class RuneSpell;
 class Spell;
 
-using VocSpellMap = phmap::btree_map<uint16_t, bool>;
+using VocSpellMap = std::map<uint16_t, bool>;
 
 class Spells final : public Scripts {
 public:

diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp
@@ -634,7 +634,7 @@ void Creature::onDeath() {
 	const int64_t timeNow = OTSYS_TIME();
 	const uint32_t inFightTicks = g_configManager().getNumber(PZ_LOCKED);
 	int32_t mostDamage = 0;
-	phmap::btree_map<Creature*, uint64_t> experienceMap;
+	std::map<Creature*, uint64_t> experienceMap;
 	for (const auto &it : damageMap) {
 		if (Creature* attacker = g_game().getCreatureByID(it.first)) {
 			CountBlock_t cb = it.second;

diff --git a/src/creatures/creature.hpp b/src/creatures/creature.hpp
@@ -519,7 +519,7 @@ class Creature : virtual public Thing {
 		int32_t total;
 		int64_t ticks;
 	};
-	using CountMap = phmap::btree_map<uint32_t, CountBlock_t>;
+	using CountMap = std::map<uint32_t, CountBlock_t>;
 	CountMap getDamageMap() const {
 		return damageMap;
 	}

diff --git a/src/creatures/creatures_definitions.hpp b/src/creatures/creatures_definitions.hpp
@@ -1451,9 +1451,9 @@ struct HistoryMarketOffer {
 
 using MarketOfferList = std::list<MarketOffer>;
 using HistoryMarketOfferList = std::list<HistoryMarketOffer>;
-using StashItemList = phmap::btree_map<uint16_t, uint32_t>;
+using StashItemList = std::map<uint16_t, uint32_t>;
 
-using ItemsTierCountList = phmap::btree_map<uint16_t, phmap::btree_map<uint8_t, uint32_t>>;
+using ItemsTierCountList = std::map<uint16_t, std::map<uint8_t, uint32_t>>;
 /*
 	> ItemsTierCountList structure:
 	|- [itemID]
@@ -1639,6 +1639,6 @@ struct PartyAnalyzer {
 	uint64_t lootPrice = 0;
 	uint64_t supplyPrice = 0;
 
-	phmap::btree_map<uint16_t, uint64_t> lootMap; // [itemID] = amount
-	phmap::btree_map<uint16_t, uint64_t> supplyMap; // [itemID] = amount
+	std::map<uint16_t, uint64_t> lootMap; // [itemID] = amount
+	std::map<uint16_t, uint64_t> supplyMap; // [itemID] = amount
 };
diff --git a/src/creatures/interactions/chat.hpp b/src/creatures/interactions/chat.hpp
@@ -15,8 +15,8 @@
 class Party;
 class Player;
 
-using UsersMap = phmap::btree_map<uint32_t, Player*>;
-using InvitedMap = phmap::btree_map<uint32_t, const Player*>;
+using UsersMap = std::map<uint32_t, Player*>;
+using InvitedMap = std::map<uint32_t, const Player*>;
 
 class ChatChannel {
 public:
@@ -143,10 +143,10 @@ class Chat {
 	}
 
 private:
-	phmap::btree_map<uint16_t, ChatChannel> normalChannels;
-	phmap::btree_map<uint16_t, PrivateChatChannel> privateChannels;
-	phmap::btree_map<Party*, ChatChannel> partyChannels;
-	phmap::btree_map<uint32_t, ChatChannel> guildChannels;
+	std::map<uint16_t, ChatChannel> normalChannels;
+	std::map<uint16_t, PrivateChatChannel> privateChannels;
+	std::map<Party*, ChatChannel> partyChannels;
+	std::map<uint32_t, ChatChannel> guildChannels;
 
 	LuaScriptInterface scriptInterface;
 

diff --git a/src/creatures/monsters/monsters.hpp b/src/creatures/monsters/monsters.hpp
@@ -59,9 +59,9 @@ class MonsterType {
 	struct MonsterInfo {
 		LuaScriptInterface* scriptInterface;
 
-		phmap::btree_map<CombatType_t, int32_t> elementMap;
-		phmap::btree_map<CombatType_t, int32_t> reflectMap;
-		phmap::btree_map<CombatType_t, int32_t> healingMap;
+		std::map<CombatType_t, int32_t> elementMap;
+		std::map<CombatType_t, int32_t> reflectMap;
+		std::map<CombatType_t, int32_t> healingMap;
 
 		std::vector<voiceBlock_t> voiceVector;
 
@@ -265,7 +265,7 @@ class Monsters {
 	bool deserializeSpell(const std::shared_ptr<MonsterSpell> &spell, spellBlock_t &sb, const std::string &description = "");
 
 	std::unique_ptr<LuaScriptInterface> scriptInterface;
-	phmap::btree_map<std::string, std::shared_ptr<MonsterType>> monsters;
+	std::map<std::string, std::shared_ptr<MonsterType>> monsters;
 
 private:
 	ConditionDamage* getDamageCondition(ConditionType_t conditionType, int32_t maxDamage, int32_t minDamage, int32_t startDamage, uint32_t tickInterval);

diff --git a/src/creatures/monsters/spawns/spawn_monster.hpp b/src/creatures/monsters/spawns/spawn_monster.hpp
@@ -54,7 +54,7 @@ class SpawnMonster {
 	SpawnedMap spawnedMonsterMap;
 
 	// map of creatures in the spawn
-	phmap::btree_map<uint32_t, spawnBlock_t> spawnMonsterMap;
+	std::map<uint32_t, spawnBlock_t> spawnMonsterMap;
 
 	Position centerPos;
 	int32_t radius;

diff --git a/src/creatures/npcs/npc.hpp b/src/creatures/npcs/npc.hpp
@@ -174,9 +174,9 @@ class Npc final : public Creature {
 
 	std::string strDescription;
 
-	phmap::btree_map<uint32_t, uint16_t> playerInteractions;
+	std::map<uint32_t, uint16_t> playerInteractions;
 
-	phmap::btree_set<Player*> shopPlayerSet;
+	std::set<Player*> shopPlayerSet;
 
 	NpcType* npcType;
 	SpawnNpc* spawnNpc = nullptr;

diff --git a/src/creatures/npcs/npcs.hpp b/src/creatures/npcs/npcs.hpp
@@ -110,7 +110,7 @@ class Npcs {
 
 private:
 	std::unique_ptr<LuaScriptInterface> scriptInterface;
-	phmap::btree_map<std::string, NpcType*> npcs;
+	std::map<std::string, NpcType*> npcs;
 };
 
 constexpr auto g_npcs = Npcs::getInstance;
diff --git a/src/creatures/npcs/spawns/spawn_npc.hpp b/src/creatures/npcs/spawns/spawn_npc.hpp
@@ -54,7 +54,7 @@ class SpawnNpc {
 	SpawnedNpcMap spawnedNpcMap;
 
 	// map of npcs in the spawn
-	phmap::btree_map<uint32_t, spawnBlockNpc_t> spawnNpcMap;
+	std::map<uint32_t, spawnBlockNpc_t> spawnNpcMap;
 
 	Position centerPos;
 	int32_t radius;

diff --git a/src/creatures/players/grouping/party.cpp b/src/creatures/players/grouping/party.cpp
@@ -610,7 +610,7 @@ void Party::addPlayerLoot(const Player* player, const Item* item) {
 	if (priceType == LEADER_PRICE) {
 		playerAnalyzer->lootPrice += leader->getItemCustomPrice(item->getID()) * count;
 	} else {
-		phmap::btree_map<uint16_t, uint64_t> itemMap { { item->getID(), count } };
+		std::map<uint16_t, uint64_t> itemMap { { item->getID(), count } };
 		playerAnalyzer->lootPrice += g_game().getItemMarketPrice(itemMap, false);
 	}
 	updateTrackerAnalyzer();
@@ -632,7 +632,7 @@ void Party::addPlayerSupply(const Player* player, const Item* item) {
 	if (priceType == LEADER_PRICE) {
 		playerAnalyzer->supplyPrice += leader->getItemCustomPrice(item->getID(), true);
 	} else {
-		phmap::btree_map<uint16_t, uint64_t> itemMap { { item->getID(), 1 } };
+		std::map<uint16_t, uint64_t> itemMap { { item->getID(), 1 } };
 		playerAnalyzer->supplyPrice += g_game().getItemMarketPrice(itemMap, true);
 	}
 	updateTrackerAnalyzer();

diff --git a/src/creatures/players/grouping/party.hpp b/src/creatures/players/grouping/party.hpp
@@ -118,7 +118,7 @@ class Party {
 	const char* getSharedExpReturnMessage(SharedExpStatus_t value);
 	SharedExpStatus_t getSharedExperienceStatus();
 
-	phmap::btree_map<uint32_t, int64_t> ticksMap;
+	std::map<uint32_t, int64_t> ticksMap;
 
 	PlayerVector memberList;
 	PlayerVector inviteList;

diff --git a/src/creatures/players/grouping/team_finder.hpp b/src/creatures/players/grouping/team_finder.hpp
@@ -17,7 +17,7 @@
 class TeamFinder {
 public:
 	TeamFinder() = default;
-	TeamFinder(uint16_t initMinLevel, uint16_t initMaxLevel, uint8_t initVocationIDs, uint16_t initTeamSlots, uint16_t initFreeSlots, bool initPartyBool, uint32_t initTimestamp, uint8_t initTeamType, uint16_t initBossID, uint16_t initHunt_type, uint16_t initHunt_area, uint16_t initQuestID, uint32_t initLeaderGuid, phmap::btree_map<uint32_t, uint8_t> initMembersMap) :
+	TeamFinder(uint16_t initMinLevel, uint16_t initMaxLevel, uint8_t initVocationIDs, uint16_t initTeamSlots, uint16_t initFreeSlots, bool initPartyBool, uint32_t initTimestamp, uint8_t initTeamType, uint16_t initBossID, uint16_t initHunt_type, uint16_t initHunt_area, uint16_t initQuestID, uint32_t initLeaderGuid, std::map<uint32_t, uint8_t> initMembersMap) :
 		minLevel(initMinLevel),
 		maxLevel(initMaxLevel),
 		vocationIDs(initVocationIDs),
@@ -49,5 +49,5 @@ class TeamFinder {
 	uint32_t leaderGuid = 0;
 
 	// list: player:getGuid(), player status
-	phmap::btree_map<uint32_t, uint8_t> membersMap = {};
+	std::map<uint32_t, uint8_t> membersMap = {};
 };
diff --git a/src/creatures/players/management/ban.hpp b/src/creatures/players/management/ban.hpp
@@ -24,7 +24,7 @@ struct ConnectBlock {
 	uint32_t count;
 };
 
-using IpConnectMap = phmap::btree_map<uint32_t, ConnectBlock>;
+using IpConnectMap = std::map<uint32_t, ConnectBlock>;
 
 class Ban {
 public:

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -1791,7 +1791,7 @@ bool Player::openShopWindow(Npc* npc) {
 	npc->addShopPlayer(this);
 
 	sendShop(npc);
-	phmap::btree_map<uint16_t, uint16_t> inventoryMap;
+	std::map<uint16_t, uint16_t> inventoryMap;
 	sendSaleItemList(getAllSaleItemIdAndCount(inventoryMap));
 	return true;
 }
@@ -3944,14 +3944,14 @@ std::vector<Item*> Player::getEquippedItems() const {
 	return valid_items;
 }
 
-phmap::btree_map<uint32_t, uint32_t> &Player::getAllItemTypeCount(phmap::btree_map<uint32_t, uint32_t> &countMap) const {
+std::map<uint32_t, uint32_t> &Player::getAllItemTypeCount(std::map<uint32_t, uint32_t> &countMap) const {
 	for (const auto item : getAllInventoryItems()) {
 		countMap[static_cast<uint32_t>(item->getID())] += Item::countByType(item, -1);
 	}
 	return countMap;
 }
 
-phmap::btree_map<uint16_t, uint16_t> &Player::getAllSaleItemIdAndCount(phmap::btree_map<uint16_t, uint16_t> &countMap) const {
+std::map<uint16_t, uint16_t> &Player::getAllSaleItemIdAndCount(std::map<uint16_t, uint16_t> &countMap) const {
 	for (const auto item : getAllInventoryItems(false, true)) {
 		if (!item->hasImbuements()) {
 			countMap[item->getID()] += item->getItemCount();
@@ -3961,7 +3961,7 @@ phmap::btree_map<uint16_t, uint16_t> &Player::getAllSaleItemIdAndCount(phmap::bt
 	return countMap;
 }
 
-void Player::getAllItemTypeCountAndSubtype(phmap::btree_map<uint32_t, uint32_t> &countMap) const {
+void Player::getAllItemTypeCountAndSubtype(std::map<uint32_t, uint32_t> &countMap) const {
 	for (const auto item : getAllInventoryItems()) {
 		uint16_t itemId = item->getID();
 		if (Item::items[itemId].isFluidContainer()) {
@@ -6107,7 +6107,7 @@ uint64_t Player::getItemCustomPrice(uint16_t itemId, bool buyPrice /* = false*/)
 		return it->second;
 	}
 
-	phmap::btree_map<uint16_t, uint64_t> itemMap { { itemId, 1 } };
+	std::map<uint16_t, uint64_t> itemMap { { itemId, 1 } };
 	return g_game().getItemMarketPrice(itemMap, buyPrice);
 }
 
@@ -6507,7 +6507,7 @@ void Player::requestDepotItems() {
 
 			uint8_t itemTier = Item::items[(*it)->getID()].upgradeClassification > 0 ? (*it)->getTier() + 1 : 0;
 			if (itemMap_it == itemMap.end()) {
-				phmap::btree_map<uint8_t, uint32_t> itemTierMap;
+				std::map<uint8_t, uint32_t> itemTierMap;
 				itemTierMap[itemTier] = Item::countByType((*it), -1);
 				itemMap[(*it)->getID()] = itemTierMap;
 				count++;
@@ -6529,7 +6529,7 @@ void Player::requestDepotItems() {
 		}
 
 		if (itemMap_it == itemMap.end()) {
-			phmap::btree_map<uint8_t, uint32_t> itemTierMap;
+			std::map<uint8_t, uint32_t> itemTierMap;
 			itemTierMap[0] = itemCount;
 			itemMap[itemId] = itemTierMap;
 			count++;
@@ -6691,13 +6691,13 @@ Item* Player::getItemFromDepotSearch(uint16_t itemId, const Position &pos) {
 	return nullptr;
 }
 
-std::pair<std::vector<Item*>, phmap::btree_map<uint16_t, phmap::btree_map<uint8_t, uint32_t>>> Player::requestLockerItems(DepotLocker* depotLocker, bool sendToClient /*= false*/, uint8_t tier /*= 0*/) const {
+std::pair<std::vector<Item*>, std::map<uint16_t, std::map<uint8_t, uint32_t>>> Player::requestLockerItems(DepotLocker* depotLocker, bool sendToClient /*= false*/, uint8_t tier /*= 0*/) const {
 	if (depotLocker == nullptr) {
 		g_logger().error("{} - Depot locker is nullptr", __FUNCTION__);
 		return {};
 	}
 
-	phmap::btree_map<uint16_t, phmap::btree_map<uint8_t, uint32_t>> lockerItems;
+	std::map<uint16_t, std::map<uint8_t, uint32_t>> lockerItems;
 	std::vector<Item*> itemVector;
 	std::vector<Container*> containers { depotLocker };