From 71000befcc1448f2bdc4b8968a581588fea4a8a1 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 13 Jul 2020 21:20:38 +0200 Subject: [PATCH] Fixed clang warnings for real this time --- src/server/game/Guilds/GuildFinderMgr.cpp | 3 +-- src/server/game/Guilds/GuildFinderMgr.h | 19 +++---------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index 5f8e28c6e4..6f349f5093 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -98,8 +98,7 @@ void GuildFinderMgr::LoadGuildSettings() if (raceEntry->BaseLanguage == 1) guildTeam = TEAM_HORDE; - LFGuildSettings settings(listed, guildTeam, guildId, classRoles, availability, interests, level, comment); - _guildSettings[guildId] = settings; + _guildSettings[guildId] = LFGuildSettings(listed, guildTeam, guildId, classRoles, availability, interests, level, comment); ++count; } while (result->NextRow()); diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h index 116738276d..732bac69f5 100644 --- a/src/server/game/Guilds/GuildFinderMgr.h +++ b/src/server/game/Guilds/GuildFinderMgr.h @@ -121,15 +121,6 @@ struct LFGuildPlayer _level = level; } - LFGuildPlayer(LFGuildPlayer const& settings) : _comment(settings.GetComment()) - { - _guid = settings.GetGUID(); - _roles = settings.GetClassRoles(); - _availability = settings.GetAvailability(); - _interests = settings.GetInterests(); - _level = settings.GetLevel(); - } - uint32 GetGUID() const { return _guid; } uint8 GetClassRoles() const { return _roles; } uint8 GetAvailability() const { return _availability; } @@ -152,17 +143,13 @@ struct LFGuildSettings : public LFGuildPlayer public: LFGuildSettings() : LFGuildPlayer(), _listed(false), _team(TEAM_ALLIANCE) {} - LFGuildSettings(bool listed, TeamId team) : LFGuildPlayer(), _listed(listed), _team(team) {} + LFGuildSettings(bool listed, TeamId team) : LFGuildPlayer(), _listed(listed), _team(team) { } LFGuildSettings(bool listed, TeamId team, uint32 guid, uint8 role, uint8 availability, uint8 interests, uint8 level) : - LFGuildPlayer(guid, role, availability, interests, level), _listed(listed), _team(team) {} + LFGuildPlayer(guid, role, availability, interests, level), _listed(listed), _team(team) { } LFGuildSettings(bool listed, TeamId team, uint32 guid, uint8 role, uint8 availability, uint8 interests, uint8 level, std::string& comment) : - LFGuildPlayer(guid, role, availability, interests, level, comment), _listed(listed), _team(team) {} - - LFGuildSettings(LFGuildSettings const& settings) : - LFGuildPlayer(settings), _listed(settings.IsListed()), _team(settings.GetTeam()) {} - + LFGuildPlayer(guid, role, availability, interests, level, comment), _listed(listed), _team(team) { } bool IsListed() const { return _listed; } void SetListed(bool state) { _listed = state; }