diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-16 19:22:24 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-07-16 19:22:24 +0200 |
| commit | 45bc91c238d04f2e2544622ff29faaf46713d15c (patch) | |
| tree | 8ecebfb1af54d7327b12e6749be5b0acb2102852 /src/server/game/Pools/PoolMgr.cpp | |
| parent | 86b516c3f27f155f267245fc27ae634a76bb1e2f (diff) | |
Core/DB: Merge pool_creature, pool_gameobject and pool_pool into a single pool_members table.
(More pooling prep, I really don't want to have any sql update files in that PR if I can help it.)
Diffstat (limited to 'src/server/game/Pools/PoolMgr.cpp')
| -rw-r--r-- | src/server/game/Pools/PoolMgr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 9ed22889d2e..22e9e5b4049 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -605,8 +605,8 @@ void PoolMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 1 2 3 - QueryResult result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_creature"); + // 1 2 3 + QueryResult result = WorldDatabase.Query("SELECT spawnId, poolSpawnId, chance FROM pool_members WHERE type = 0"); if (!result) { @@ -662,8 +662,8 @@ void PoolMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 1 2 3 - QueryResult result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_gameobject"); + // 1 2 3 + QueryResult result = WorldDatabase.Query("SELECT spawnId, poolSpawnId, chance FROM pool_members WHERE type = 1"); if (!result) { @@ -732,7 +732,7 @@ void PoolMgr::LoadFromDB() uint32 oldMSTime = getMSTime(); // 1 2 3 - QueryResult result = WorldDatabase.Query("SELECT pool_id, mother_pool, chance FROM pool_pool"); + QueryResult result = WorldDatabase.Query("SELECT spawnId, poolSpawnId, chance FROM pool_members WHERE type = 2"); if (!result) { @@ -910,9 +910,9 @@ void PoolMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT DISTINCT pool_template.entry, pool_pool.pool_id, pool_pool.mother_pool FROM pool_template" + QueryResult result = WorldDatabase.Query("SELECT DISTINCT pool_template.entry, pool_members.spawnId, pool_members.poolSpawnId FROM pool_template" " LEFT JOIN game_event_pool ON pool_template.entry = game_event_pool.pool_entry" - " LEFT JOIN pool_pool ON pool_template.entry = pool_pool.pool_id WHERE game_event_pool.pool_entry IS NULL"); + " LEFT JOIN pool_members ON pool_members.type = 2 AND pool_template.entry = pool_members.spawnId WHERE game_event_pool.pool_entry IS NULL"); if (!result) { |