aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/server/game/DungeonFinding/LFGMgr.cpp15
-rwxr-xr-xsrc/server/game/DungeonFinding/LFGMgr.h5
2 files changed, 9 insertions, 11 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index a19034a76ec..659986fb148 100755
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -31,17 +31,20 @@
#include "GroupMgr.h"
#include "GameEventMgr.h"
-LFGMgr::LFGMgr(): m_QueueTimer(0), m_lfgProposalId(1),
- m_options(sWorld->getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE)),
- m_lfgPlayerScript(new LFGPlayerScript()), m_lfgGroupScript(new LFGGroupScript())
-{ }
+LFGMgr::LFGMgr(): m_QueueTimer(0), m_lfgProposalId(1)
+{
+ m_options = sWorld->getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE);
+ if (m_options)
+ {
+ new LFGPlayerScript();
+ new LFGGroupScript();
+ }
+}
LFGMgr::~LFGMgr()
{
for (LfgRewardMap::iterator itr = m_RewardMap.begin(); itr != m_RewardMap.end(); ++itr)
delete itr->second;
- delete m_lfgPlayerScript;
- delete m_lfgGroupScript;
}
void LFGMgr::_LoadFromDB(Field* fields, uint64 guid)
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index 39cdd390792..286e82386a7 100755
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -25,8 +25,6 @@
#include "LFGGroupData.h"
#include "LFGPlayerData.h"
-class LFGPlayerScript;
-class LFGGroupScript;
class Group;
class Player;
@@ -406,9 +404,6 @@ class LFGMgr
LfgPlayerDataMap m_Players; ///< Player data
LfgGroupDataMap m_Groups; ///< Group data
LfgGuidList m_teleport; ///< Players being teleported
-
- LFGPlayerScript *m_lfgPlayerScript;
- LFGGroupScript *m_lfgGroupScript;
};
#define sLFGMgr ACE_Singleton<LFGMgr, ACE_Null_Mutex>::instance()