pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix issue in zone store of returning reference to local variable (#3477)

Browse Source 
# Notes
- Compiler did not like possibly returning a reference to a local variable.
This commit is contained in:
Alex King 2023-07-04 04:08:44 -04:00 committed by GitHub
parent e9e8143778
commit d3c3d7b384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/zone_store.cpp
View File

@ -370,7 +370,7 @@ uint32 ZoneStore::GetZoneRuleSet(uint32 zone_id, int version)
return 0;
}
const std::string& ZoneStore::GetZoneNote(uint32 zone_id, int version)
const std::string ZoneStore::GetZoneNote(uint32 zone_id, int version)
{
for (auto &z: m_zones) {
if (z.zoneidnumber == zone_id && z.version == version) {
@ -384,8 +384,7 @@ const std::string& ZoneStore::GetZoneNote(uint32 zone_id, int version)
}
}
const auto& note = std::string();
return note;
return "";
}
float ZoneStore::GetZoneUnderworld(uint32 zone_id, int version)
@ -736,7 +735,7 @@ float ZoneStore::GetZoneFogDensity(uint32 zone_id, int version)
return 0.0f;
}
const std::string& ZoneStore::GetZoneFlagNeeded(uint32 zone_id, int version)
const std::string ZoneStore::GetZoneFlagNeeded(uint32 zone_id, int version)
{
for (auto &z: m_zones) {
if (z.zoneidnumber == zone_id && z.version == version) {
@ -750,8 +749,7 @@ const std::string& ZoneStore::GetZoneFlagNeeded(uint32 zone_id, int version)
}
}
const auto& flag_needed = std::string();
return flag_needed;
return "";
}
int8 ZoneStore::GetZoneCanBind(uint32 zone_id, int version)
@ -1259,7 +1257,7 @@ int8 ZoneStore::GetZoneMaximumExpansion(uint32 zone_id, int version)
return DEFAULT_ZONE_MIN_MAX_EXPANSION;
}
const std::string& ZoneStore::GetZoneContentFlags(uint32 zone_id, int version)
const std::string ZoneStore::GetZoneContentFlags(uint32 zone_id, int version)
{
for (auto &z: m_zones) {
if (z.zoneidnumber == zone_id && z.version == version) {
@ -1271,13 +1269,12 @@ const std::string& ZoneStore::GetZoneContentFlags(uint32 zone_id, int version)
if (z.zoneidnumber == zone_id && z.version == 0) {
return z.content_flags;
}
}
};
const auto& content_flags = std::string();
return content_flags;
return "";
}
const std::string& ZoneStore::GetZoneContentFlagsDisabled(uint32 zone_id, int version)
const std::string ZoneStore::GetZoneContentFlagsDisabled(uint32 zone_id, int version)
{
for (auto &z: m_zones) {
if (z.zoneidnumber == zone_id && z.version == version) {
@ -1291,8 +1288,7 @@ const std::string& ZoneStore::GetZoneContentFlagsDisabled(uint32 zone_id, int ve
}
}
const auto& content_flags_disabled = std::string();
return content_flags_disabled;
return "";
}
int ZoneStore::GetZoneUnderworldTeleportIndex(uint32 zone_id, int version)

8
common/zone_store.h
View File

@ -54,7 +54,7 @@ public:
int GetZoneTimeZone(uint32 zone_id, int version = 0);
int GetZoneMaximumPlayers(uint32 zone_id, int version = 0);
uint32 GetZoneRuleSet(uint32 zone_id, int version = 0);
const std::string& GetZoneNote(uint32 zone_id, int version = 0);
const std::string GetZoneNote(uint32 zone_id, int version = 0);
float GetZoneUnderworld(uint32 zone_id, int version = 0);
float GetZoneMinimumClip(uint32 zone_id, int version = 0);
float GetZoneMaximumClip(uint32 zone_id, int version = 0);
@ -69,7 +69,7 @@ public:
float GetZoneWalkSpeed(uint32 zone_id, int version = 0);
uint8 GetZoneTimeType(uint32 zone_id, int version = 0);
float GetZoneFogDensity(uint32 zone_id, int version = 0);
const std::string& GetZoneFlagNeeded(uint32 zone_id, int version = 0);
const std::string GetZoneFlagNeeded(uint32 zone_id, int version = 0);
int8 GetZoneCanBind(uint32 zone_id, int version = 0);
int8 GetZoneCanCombat(uint32 zone_id, int version = 0);
int8 GetZoneCanLevitate(uint32 zone_id, int version = 0);
@ -95,8 +95,8 @@ public:
uint32 GetZoneMaximumMovementUpdateRange(uint32 zone_id, int version = 0);
int8 GetZoneMinimumExpansion(uint32 zone_id, int version = 0);
int8 GetZoneMaximumExpansion(uint32 zone_id, int version = 0);
const std::string& GetZoneContentFlags(uint32 zone_id, int version = 0);
const std::string& GetZoneContentFlagsDisabled(uint32 zone_id, int version = 0);
const std::string GetZoneContentFlags(uint32 zone_id, int version = 0);
const std::string GetZoneContentFlagsDisabled(uint32 zone_id, int version = 0);
int GetZoneUnderworldTeleportIndex(uint32 zone_id, int version = 0);
int GetZoneLavaDamage(uint32 zone_id, int version = 0);
int GetZoneMinimumLavaDamage(uint32 zone_id, int version = 0);