aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Pools
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-05-18 23:52:58 +0200
committerShauren <shauren.trinity@gmail.com>2017-05-18 23:53:25 +0200
commitc5d3dd90bea3889ef5fcd33c9ef0d59d7c544f8a (patch)
treeaa7fde6f924fc39da54908bd6eeeb0be422e5fc3 /src/server/game/Pools
parent74456703146194de72424ec98c4ea76402077be6 (diff)
Core/Game: Include cleanup
* Mostly aimed at removing Log/DatabaseEnv includes from other headers * Fix most packet headers including other packet headers - moved common structures such as ItemInstance to their own files * Moved SAI function definitions to source files (massive or requiring many different dependencies)
Diffstat (limited to 'src/server/game/Pools')
-rw-r--r--src/server/game/Pools/PoolMgr.cpp8
-rw-r--r--src/server/game/Pools/PoolMgr.h12
2 files changed, 15 insertions, 5 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index 3118d0e00d1..ba614cfb4b6 100644
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -18,9 +18,15 @@
#include "PoolMgr.h"
#include "Containers.h"
-#include "ObjectMgr.h"
+#include "DatabaseEnv.h"
#include "Log.h"
#include "MapManager.h"
+#include "ObjectMgr.h"
+#include <sstream>
+
+PoolObject::PoolObject(uint64 _guid, float _chance) : guid(_guid), chance(std::fabs(_chance))
+{
+}
////////////////////////////////////////////////////////////
// template class ActivePoolData
diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
index 74d5b0c269e..255d2890ee7 100644
--- a/src/server/game/Pools/PoolMgr.h
+++ b/src/server/game/Pools/PoolMgr.h
@@ -20,9 +20,13 @@
#define TRINITY_POOLHANDLER_H
#include "Define.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "QuestDef.h"
+#include <map>
+#include <set>
+#include <vector>
+
+class Creature;
+class GameObject;
+class Quest;
struct PoolTemplateData
{
@@ -33,7 +37,7 @@ struct PoolObject
{
uint64 guid;
float chance;
- PoolObject(uint64 _guid, float _chance) : guid(_guid), chance(std::fabs(_chance)) { }
+ PoolObject(uint64 _guid, float _chance);
};
class Pool // for Pool of Pool case