diff options
| author | QAston <qaston@gmail.com> | 2011-07-02 16:12:43 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-07-02 16:12:43 +0200 |
| commit | 1068583172141dcb1ca51a6b15fa2170ae094e97 (patch) | |
| tree | eea2c65e1458595c5b8f105d868c4f676f1ab286 /src/server/game/Pools/PoolMgr.cpp | |
| parent | 86dde83ddade00c66a5af552d65d4787c22b6361 (diff) | |
| parent | f3dfa8066a291e144f53142d62b4e2f493e57137 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Pools/PoolMgr.cpp')
| -rwxr-xr-x | src/server/game/Pools/PoolMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index e2a5bdfef91..1c239fc0438 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -140,7 +140,7 @@ void PoolGroup<T>::AddEntry(PoolObject& poolitem, uint32 maxentries) template <class T> bool PoolGroup<T>::CheckPool() const { - if (!EqualChanced.size()) + if (EqualChanced.empty()) { float chance = 0; for (uint32 i = 0; i < ExplicitlyChanced.size(); ++i) @@ -496,7 +496,7 @@ void PoolGroup<Quest>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 Spawn1Object(&tempObj); newQuests.erase(itr); --limit; - } while (limit && newQuests.size()); + } while (limit && !newQuests.empty()); // if we are here it means the pool is initialized at startup and did not have previous saved state if (!triggerFrom) @@ -779,7 +779,7 @@ void PoolMgr::LoadFromDB() while (result->NextRow()); // Now check for circular reference - for (uint32 i=0; i<mPoolPoolGroups.size(); ++i) + for (uint32 i=0; i < max_pool_id; ++i) { std::set<uint32> checkedPools; for (SearchMap::iterator poolItr = mPoolSearchMap.find(i); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second)) |