# Conflicts:
#	src/server/game/AI/CoreAI/PetAI.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
#	src/server/game/DungeonFinding/LFGMgr.h
#	src/server/game/DungeonFinding/LFGQueue.h
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Entities/Pet/Pet.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Globals/ObjectMgr.h
#	src/server/game/Groups/Group.cpp
#	src/server/game/Groups/Group.h
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/Guild.h
#	src/server/game/Handlers/GuildHandler.cpp
#	src/server/game/Handlers/LFGHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Handlers/NPCHandler.cpp
#	src/server/game/Instances/InstanceScript.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Maps/Map.h
#	src/server/game/Maps/ZoneScript.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/game/Weather/Weather.cpp
#	src/server/game/Weather/WeatherMgr.cpp
#	src/server/scripts/Commands/cs_reload.cpp
#	src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
#	src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
#	src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
#	src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
#	src/server/scripts/Spells/spell_dk.cpp
#	src/server/scripts/Spells/spell_druid.cpp
#	src/server/scripts/Spells/spell_generic.cpp
#	src/server/scripts/Spells/spell_hunter.cpp
#	src/server/scripts/Spells/spell_mage.cpp
#	src/server/scripts/Spells/spell_pet.cpp
#	src/server/scripts/Spells/spell_shaman.cpp
#	src/server/scripts/Spells/spell_warrior.cpp
This commit is contained in:
Ovahlord committed 2018-03-28 12:35:52 +02:00
commit 2cfdd3cbe0
1450 files changed
+72503 -36529

No files matched your search

+10 -5
View File
@@ -15,8 +15,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Common.h"
#include "GuildMgr.h"
#include "AchievementMgr.h"
#include "DatabaseEnv.h"
#include "Guild.h"
#include "Log.h"
#include "ObjectMgr.h"
#include "World.h"
GuildMgr::GuildMgr() : NextGuildId(1)
{ }
@@ -60,7 +65,7 @@ Guild* GuildMgr::GetGuildById(ObjectGuid::LowType guildId) const
if (itr != GuildStore.end())
return itr->second;
return NULL;
return nullptr;
}
Guild* GuildMgr::GetGuildByGuid(ObjectGuid guid) const
@@ -71,7 +76,7 @@ Guild* GuildMgr::GetGuildByGuid(ObjectGuid guid) const
if (uint32 guildId = guid.GetCounter())
return GetGuildById(guildId);
return NULL;
return nullptr;
}
Guild* GuildMgr::GetGuildByName(const std::string& guildName) const
@@ -85,7 +90,7 @@ Guild* GuildMgr::GetGuildByName(const std::string& guildName) const
if (search == gname)
return itr->second;
}
return NULL;
return nullptr;
}
std::string GuildMgr::GetGuildNameById(ObjectGuid::LowType guildId) const
@@ -108,7 +113,7 @@ Guild* GuildMgr::GetGuildByLeader(ObjectGuid guid) const
if (itr->second->GetLeaderGUID() == guid)
return itr->second;
return NULL;
return nullptr;
}
uint32 GuildMgr::GetXPForGuildLevel(uint8 level) const