From 52417023f883bd1510b57009de272c8b317d0289 Mon Sep 17 00:00:00 2001 From: JJ <3617814+joligario@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:17:21 -0400 Subject: [PATCH] [Cleanup] Remove unnecessary reference types (#4212) Minor clean up from #4054 and #4181 --- common/database.cpp | 10 +++++----- common/database.h | 10 +++++----- zone/mob.cpp | 2 +- zone/mob.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index aad665464..247c602ab 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -632,7 +632,7 @@ uint32 Database::GetAccountIDByName(const std::string& account_name, const std:: return e.id; } -const std::string& Database::GetAccountName(uint32 account_id, uint32* lsaccount_id) +const std::string Database::GetAccountName(uint32 account_id, uint32* lsaccount_id) { const auto& e = AccountRepository::FindOne(*this, account_id); @@ -647,28 +647,28 @@ const std::string& Database::GetAccountName(uint32 account_id, uint32* lsaccount return e.name; } -const std::string& Database::GetCharName(uint32 character_id) +const std::string Database::GetCharName(uint32 character_id) { const auto& e = CharacterDataRepository::FindOne(*this, character_id); return e.id ? e.name : std::string(); } -const std::string& Database::GetCharNameByID(uint32 character_id) +const std::string Database::GetCharNameByID(uint32 character_id) { const auto& e = CharacterDataRepository::FindOne(*this, character_id); return e.id ? e.name : std::string(); } -const std::string& Database::GetNPCNameByID(uint32 npc_id) +const std::string Database::GetNPCNameByID(uint32 npc_id) { const auto& e = NpcTypesRepository::FindOne(*this, npc_id); return e.id ? e.name : std::string(); } -const std::string& Database::GetCleanNPCNameByID(uint32 npc_id) +const std::string Database::GetCleanNPCNameByID(uint32 npc_id) { const auto& e = NpcTypesRepository::FindOne(*this, npc_id); diff --git a/common/database.h b/common/database.h index fd3f89b3b..f57721c7e 100644 --- a/common/database.h +++ b/common/database.h @@ -125,11 +125,11 @@ public: uint32 GetGroupIDByCharID(uint32 character_id); uint32 GetRaidIDByCharID(uint32 character_id); - const std::string& GetAccountName(uint32 account_id, uint32* lsaccount_id = 0); - const std::string& GetCharName(uint32 character_id); - const std::string& GetCharNameByID(uint32 character_id); - const std::string& GetNPCNameByID(uint32 npc_id); - const std::string& GetCleanNPCNameByID(uint32 npc_id); + const std::string GetAccountName(uint32 account_id, uint32* lsaccount_id = 0); + const std::string GetCharName(uint32 character_id); + const std::string GetCharNameByID(uint32 character_id); + const std::string GetNPCNameByID(uint32 npc_id); + const std::string GetCleanNPCNameByID(uint32 npc_id); void LoginIP(uint32 account_id, const std::string& login_ip); /* Instancing */ diff --git a/zone/mob.cpp b/zone/mob.cpp index 9d2ca6b2b..f00c92b09 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -1113,7 +1113,7 @@ uint8 Mob::GetArchetype() const return Archetype::Hybrid; } -const std::string& Mob::GetArchetypeName() +const std::string Mob::GetArchetypeName() { switch (GetArchetype()) { case Archetype::Hybrid: diff --git a/zone/mob.h b/zone/mob.h index 49331a808..08735706e 100644 --- a/zone/mob.h +++ b/zone/mob.h @@ -842,7 +842,7 @@ public: bool IsPureMeleeClass() const; bool IsWisdomCasterClass() const; uint8 GetArchetype() const; - const std::string& GetArchetypeName(); + const std::string GetArchetypeName(); void SetZone(uint32 zone_id, uint32 instance_id); void SendStatsWindow(Client* c, bool use_window); void ShowStats(Client* client);