Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fixed clang warnings for real this time

Browse Source
This commit is contained in:
Ovahlord committed 2020-07-14 10:32:51 +02:00
1 parent ff42bb7917
commit 71000befcc
2 files changed
+4 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Guilds/GuildFinderMgr.cpp
+1 -2
View File
@@ -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());
src/server/game/Guilds/GuildFinderMgr.h
+3 -16
View File
@@ -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; }