improve

opentibiabr · Oct 23, 2023 · 427866f · 427866f
1 parent 0da016b
commit 427866f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp
@@ -1311,7 +1311,7 @@ std::vector<std::pair<Position, std::vector<uint32_t>>> Combat::pickChainTargets
 
 	std::vector<std::pair<Position, std::vector<uint32_t>>> resultMap;
 	std::vector<std::shared_ptr<Creature>> targets;
-	std::set<uint32_t> visited;
+	phmap::flat_hash_set<uint32_t> visited;
 
 	if (initialTarget && initialTarget != caster) {
 		targets.push_back(initialTarget);

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -5928,18 +5928,18 @@ uint16_t Player::getHelpers() const {
 
 		helperSet.emplace(party->getLeader());
 
-		return helperSet.size();
+		return static_cast<uint16_t>(helperSet.size());
 	}
 
 	if (guild) {
-		return guild->getMemberCountOnline();
+		return static_cast<uint16_t>(guild->getMemberCountOnline());
 	}
 
 	if (party) {
-		return party->getMemberCount() + party->getInvitationCount() + 1;
+		return static_cast<uint16_t>(party->getMemberCount() + party->getInvitationCount() + 1);
 	}
 
-	return 0;
+	return 0u;
 }
 
 void Player::sendClosePrivate(uint16_t channelId) {

diff --git a/src/items/tile.hpp b/src/items/tile.hpp
@@ -175,7 +175,7 @@ class Tile : public Cylinder, public SharedObject {
 	void addZone(std::shared_ptr<Zone> zone);
 	void clearZones();
 
-	auto getZones() {
+	auto getZones() const {
 		return zones;
 	}
 

diff --git a/src/lua/creature/events.cpp b/src/lua/creature/events.cpp
@@ -37,7 +37,7 @@ bool Events::loadFromXml() {
 		}
 
 		const std::string &className = eventNode.attribute("class").as_string();
-		auto res = classes.insert(className);
+		auto res = classes.emplace(className);
 		if (res.second) {
 			const std::string &lowercase = asLowerCaseString(className);
 			const std::string &scriptName = lowercase + ".lua";

diff --git a/src/map/house/house.cpp b/src/map/house/house.cpp
@@ -369,10 +369,6 @@ bool House::getAccessList(uint32_t listId, std::string &list) const {
 	return door->getAccessList(list);
 }
 
-bool House::isInvited(std::shared_ptr<Player> player) {
-	return getHouseAccessLevel(player) != HOUSE_NOT_INVITED;
-}
-
 void House::addDoor(std::shared_ptr<Door> door) {
 	doorList.push_back(door);
 	door->setHouse(static_self_cast<House>());
@@ -414,7 +410,7 @@ std::shared_ptr<Door> House::getDoorByPosition(const Position &pos) {
 	return nullptr;
 }
 
-bool House::canEditAccessList(uint32_t listId, std::shared_ptr<Player> player) {
+bool House::canEditAccessList(uint32_t listId, const std::shared_ptr<Player> &player) const {
 	switch (getHouseAccessLevel(player)) {
 		case HOUSE_OWNER:
 			return true;

diff --git a/src/map/house/house.hpp b/src/map/house/house.hpp
@@ -104,14 +104,16 @@ class House : public SharedObject {
 	void addTile(std::shared_ptr<HouseTile> tile);
 	void updateDoorDescription() const;
 
-	bool canEditAccessList(uint32_t listId, std::shared_ptr<Player> player);
+	bool canEditAccessList(uint32_t listId, const std::shared_ptr<Player> &player) const;
 	// listId special = values:
 	// GUEST_LIST = guest list
 	// SUBOWNER_LIST = subowner list
 	void setAccessList(uint32_t listId, const std::string &textlist);
 	bool getAccessList(uint32_t listId, std::string &list) const;
 
-	bool isInvited(std::shared_ptr<Player> player);
+	bool isInvited(const std::shared_ptr<Player> &player) const {
+		return getHouseAccessLevel(player) != HOUSE_NOT_INVITED;
+	}
 
 	AccessHouseLevel_t getHouseAccessLevel(std::shared_ptr<Player> player) const;
 	bool kickPlayer(std::shared_ptr<Player> player, std::shared_ptr<Player> target);