diff options
19 files changed, 69 insertions, 50 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 6c42b1728c1..300268ed7c8 100755 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -254,9 +254,12 @@ struct LfgPlayerBoot class LFGMgr { friend class ACE_Singleton<LFGMgr, ACE_Null_Mutex>; - public: + + private: LFGMgr(); ~LFGMgr(); + + public: void Update(uint32 diff); // Reward diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 8c49ff06d5a..bf0fd1ae214 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -196,7 +196,7 @@ void Creature::RemoveFromWorld() if (m_zoneScript) m_zoneScript->OnCreatureRemove(this); if (m_formation) - sFormationMgr->RemoveCreatureFromGroup(m_formation, this); + FormationMgr::RemoveCreatureFromGroup(m_formation, this); Unit::RemoveFromWorld(); sObjectAccessor->RemoveObject(this); } @@ -223,7 +223,7 @@ void Creature::SearchFormation() CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid); if (frmdata != CreatureGroupMap.end()) - sFormationMgr->AddCreatureToGroup(frmdata->second->leaderGUID, this); + FormationMgr::AddCreatureToGroup(frmdata->second->leaderGUID, this); } void Creature::RemoveCorpse(bool setSpawnTime) diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 3fdb996bc5a..0167aa08d30 100755 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -26,7 +26,10 @@ CreatureGroupInfoType CreatureGroupMap; -void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature* member) +namespace FormationMgr +{ + +void AddCreatureToGroup(uint32 groupId, Creature* member) { Map* map = member->FindMap(); if (!map) @@ -50,7 +53,7 @@ void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature* member) } } -void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup* group, Creature* member) +void RemoveCreatureFromGroup(CreatureGroup* group, Creature* member) { sLog->outDebug(LOG_FILTER_UNITS, "Deleting member pointer to GUID: %u from group %u", group->GetId(), member->GetDBTableGUIDLow()); group->RemoveMember(member); @@ -67,7 +70,7 @@ void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup* group, Creatur } } -void CreatureGroupManager::LoadCreatureFormations() +void LoadCreatureFormations() { uint32 oldMSTime = getMSTime(); @@ -151,6 +154,8 @@ void CreatureGroupManager::LoadCreatureFormations() sLog->outString(); } +} // Namespace + void CreatureGroup::AddMember(Creature* member) { sLog->outDebug(LOG_FILTER_UNITS, "CreatureGroup::AddMember: Adding unit GUID: %u.", member->GetGUIDLow()); diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index 5aafe1dc2b3..3ef7e157b66 100755 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -19,8 +19,11 @@ #ifndef _FORMATIONS_H #define _FORMATIONS_H -#include "Common.h" +#include "Define.h" +#include "UnorderedMap.h" +#include <map> +class Creature; class CreatureGroup; struct FormationInfo @@ -31,20 +34,16 @@ struct FormationInfo uint8 groupAI; }; -class CreatureGroupManager +namespace FormationMgr { - friend class ACE_Singleton<CreatureGroupManager, ACE_Null_Mutex>; - public: - void AddCreatureToGroup(uint32 group_id, Creature* creature); - void RemoveCreatureFromGroup(CreatureGroup* group, Creature* creature); - void LoadCreatureFormations(); + void AddCreatureToGroup(uint32 group_id, Creature* creature); + void RemoveCreatureFromGroup(CreatureGroup* group, Creature* creature); + void LoadCreatureFormations(); }; -#define sFormationMgr ACE_Singleton<CreatureGroupManager, ACE_Null_Mutex>::instance() - typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*> CreatureGroupInfoType; -extern CreatureGroupInfoType CreatureGroupMap; +extern CreatureGroupInfoType CreatureGroupMap; class CreatureGroup { @@ -59,7 +58,7 @@ class CreatureGroup public: //Group cannot be created empty explicit CreatureGroup(uint32 id) : m_leader(NULL), m_groupID(id), m_Formed(false) {} - ~CreatureGroup() { sLog->outDebug(LOG_FILTER_UNITS, "Destroying group"); } + ~CreatureGroup() {} Creature* getLeader() const { return m_leader; } uint32 GetId() const { return m_groupID; } diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index b69478ab0e5..1af59592eea 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -221,7 +221,7 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMa { case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING: m_goValue->Building.Health = goinfo->building.intactNumHits + goinfo->building.damagedNumHits; - m_goValue->Building.MaxHealth = goinfo->building.intactNumHits + goinfo->building.damagedNumHits; + m_goValue->Building.MaxHealth = m_goValue->Building.Health; SetGoAnimProgress(255); break; case GAMEOBJECT_TYPE_TRANSPORT: diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index ae47f7a24cd..5faa8f1987c 100755 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -139,9 +139,12 @@ class PlayerSocial class SocialMgr { friend class ACE_Singleton<SocialMgr, ACE_Null_Mutex>; - SocialMgr(); - public: + + private: + SocialMgr(); ~SocialMgr(); + + public: // Misc void RemovePlayerSocial(uint32 guid) { m_socialMap.erase(guid); } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5301b647bea..9e74e3a8f5b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12120,7 +12120,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell) co // can't attack unattackable units or GMs if (target->HasUnitState(UNIT_STAT_UNATTACKABLE) - || target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->isGameMaster()) + || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->isGameMaster())) return false; // can't attack own vehicle or passenger @@ -12214,7 +12214,7 @@ bool Unit::_IsValidAssistTarget(Unit const* target, SpellInfo const* bySpell) co // can't assist unattackable units or GMs if (target->HasUnitState(UNIT_STAT_UNATTACKABLE) - || target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->isGameMaster()) + || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->isGameMaster())) return false; // can't assist own vehicle or passenger diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 510e702fac9..a9be8b4971f 100755 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -86,13 +86,13 @@ class ObjectAccessor { friend class ACE_Singleton<ObjectAccessor, ACE_Thread_Mutex>; friend class WorldRunnable; - ObjectAccessor(); - ~ObjectAccessor(); - ObjectAccessor(const ObjectAccessor&); - ObjectAccessor& operator=(const ObjectAccessor&); + private: + ObjectAccessor(); + ~ObjectAccessor(); + ObjectAccessor(const ObjectAccessor&); + ObjectAccessor& operator=(const ObjectAccessor&); public: - typedef UNORDERED_MAP<uint64, Corpse*> Player2CorpsesMapType; typedef UNORDERED_MAP<Player*, UpdateData>::value_type UpdateDataValueType; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 95382b751f3..c557af1c2b2 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -1191,8 +1191,7 @@ class ObjectMgr void LoadFactionChangeSpells(); void LoadFactionChangeReputations(); - protected: - + private: // first free id for selected id type uint32 m_auctionid; uint64 m_equipmentSetGuid; diff --git a/src/server/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h index e33d28be7d5..aa74112ad35 100644 --- a/src/server/game/Groups/GroupMgr.h +++ b/src/server/game/Groups/GroupMgr.h @@ -23,6 +23,7 @@ class GroupMgr { friend class ACE_Singleton<GroupMgr, ACE_Null_Mutex>; +private: GroupMgr(); ~GroupMgr(); diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index c79d2b5c3dc..63d54e4ec94 100755 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -118,6 +118,8 @@ class InstanceSaveManager { friend class ACE_Singleton<InstanceSaveManager, ACE_Thread_Mutex>; friend class InstanceSave; + + private: InstanceSaveManager() : lock_instLists(false) {}; ~InstanceSaveManager(); @@ -148,10 +150,12 @@ class InstanceSaveManager ResetTimeByMapDifficultyMap::const_iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR32(mapid, d)); return itr != m_resetTimeByMapDifficulty.end() ? itr->second : 0; } + void SetResetTimeFor(uint32 mapid, Difficulty d, time_t t) { m_resetTimeByMapDifficulty[MAKE_PAIR32(mapid, d)] = t; } + ResetTimeByMapDifficultyMap const& GetResetTimeMap() const { return m_resetTimeByMapDifficulty; @@ -160,7 +164,8 @@ class InstanceSaveManager void Update(); - InstanceSave* AddInstanceSave(uint32 mapId, uint32 instanceId, Difficulty difficulty, time_t resetTime, bool canReset, bool load = false); + InstanceSave* AddInstanceSave(uint32 mapId, uint32 instanceId, Difficulty difficulty, time_t resetTime, + bool canReset, bool load = false); void RemoveInstanceSave(uint32 InstanceId); static void DeleteInstanceFromDB(uint32 instanceid); @@ -175,7 +180,6 @@ class InstanceSaveManager static uint16 ResetTimeDelay[]; private: - void _ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, time_t resetTime); void _ResetInstance(uint32 mapid, uint32 instanceId); void _ResetSave(InstanceSaveHashMap::iterator &itr); diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h index 85df2c37aa7..6f0e0ba91b9 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h @@ -38,14 +38,13 @@ struct OutdoorPvPData // class to handle player enter / leave / areatrigger / GO use events class OutdoorPvPMgr { - public: + friend class ACE_Singleton<OutdoorPvPMgr, ACE_Null_Mutex>; - // ctor + private: OutdoorPvPMgr(); - - // dtor ~OutdoorPvPMgr(); + public: // create outdoor pvp events void InitOutdoorPvP(); @@ -79,12 +78,11 @@ class OutdoorPvPMgr void HandleDropFlag(Player* plr, uint32 spellId); + private: typedef std::vector<OutdoorPvP*> OutdoorPvPSet; typedef std::map<uint32 /* zoneid */, OutdoorPvP*> OutdoorPvPMap; typedef std::map<OutdoorPvPTypes, OutdoorPvPData*> OutdoorPvPDataMap; - private: - // contains all initiated outdoor pvp events // used when initing / cleaning up OutdoorPvPSet m_OutdoorPvPSet; diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index 96f4632769c..055763480e3 100755 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -105,8 +105,10 @@ typedef std::pair<PooledQuestRelation::iterator, PooledQuestRelation::iterator> class PoolMgr { friend class ACE_Singleton<PoolMgr, ACE_Null_Mutex>; - PoolMgr(); - ~PoolMgr() {}; + + private: + PoolMgr(); + ~PoolMgr() {}; public: void LoadFromDB(); @@ -134,7 +136,8 @@ class PoolMgr PooledQuestRelation mQuestCreatureRelation; PooledQuestRelation mQuestGORelation; - protected: + + private: template<typename T> void SpawnPool(uint32 pool_id, uint32 db_guid_or_pool_id); diff --git a/src/server/game/Server/Protocol/WorldLog.h b/src/server/game/Server/Protocol/WorldLog.h index 46d12ec1aff..a951cba4ab5 100755 --- a/src/server/game/Server/Protocol/WorldLog.h +++ b/src/server/game/Server/Protocol/WorldLog.h @@ -33,13 +33,13 @@ class WorldLog { friend class ACE_Singleton<WorldLog, ACE_Thread_Mutex>; - WorldLog(); - WorldLog(const WorldLog &); - WorldLog& operator=(const WorldLog &); - ACE_Thread_Mutex Lock; - /// Close the file in destructor - ~WorldLog(); + private: + WorldLog(); + ~WorldLog(); + WorldLog(const WorldLog &); + WorldLog& operator=(const WorldLog &); + ACE_Thread_Mutex Lock; public: void Initialize(); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 6b874a6907f..255c6307d58 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -843,6 +843,8 @@ void Spell::SelectEffectTypeImplicitTargets(uint8 effIndex) if (targetMask & TARGET_FLAG_UNIT_MASK) AddUnitTarget(m_caster, 1 << effIndex, false); break; + default: + break; } } diff --git a/src/server/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h index 85ee259fcc9..73ff869c0d6 100755 --- a/src/server/game/Tickets/TicketMgr.h +++ b/src/server/game/Tickets/TicketMgr.h @@ -162,9 +162,11 @@ typedef std::map<uint32, GmTicket*> GmTicketList; class TicketMgr { - TicketMgr(); friend class ACE_Singleton<TicketMgr, ACE_Null_Mutex>; +private: + TicketMgr(); + public: void LoadTickets(); void LoadSurveys(); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 9f1d99cff98..f7e1f3a1492 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1564,7 +1564,7 @@ void World::SetInitialWorldSettings() sSmartWaypointMgr->LoadFromDB(); sLog->outString("Loading Creature Formations..."); - sFormationMgr->LoadCreatureFormations(); + FormationMgr::LoadCreatureFormations(); sLog->outString("Loading Conditions..."); sConditionMgr->LoadConditions(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 256b03c7754..aa9516d479f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -1666,7 +1666,7 @@ class spell_pursue : public SpellScriptLoader caster->AI()->EnterEvadeMode(); } - void HandleScript(SpellEffIndex eff) + void HandleScript(SpellEffIndex /*eff*/) { Creature* caster = GetCaster()->ToCreature(); if (!caster) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index e1c64499df2..251a18e98f2 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -509,7 +509,7 @@ class instance_ulduar : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 /*type*/, uint64 /*data*/) { } |