From c5684fa7abcb1d875c06bae20e17ed3c9f328b7c Mon Sep 17 00:00:00 2001
From: NoFantasy <nofantasy@nf.no>
Date: Sat, 19 Sep 2009 11:57:19 +0200
Subject: [PATCH] [8508] Not assign boolean value to integer variable,
 expecting to always be 0.

Also renaming member variables.

Signed-off-by: NoFantasy <nofantasy@nf.no>
---
 src/game/PoolHandler.cpp | 22 +++++++++++++---------
 src/game/PoolHandler.h   |  4 ++--
 src/shared/revision_nr.h |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp
index 2acab75ed..d1f2305bd 100644
--- a/src/game/PoolHandler.cpp
+++ b/src/game/PoolHandler.cpp
@@ -32,6 +32,7 @@ template <class T>
 PoolGroup<T>::PoolGroup()
 {
     m_SpawnedPoolAmount = 0;
+    m_LastDespawnedNode = 0;
 }
 
 // Method to add a gameobject/creature guid to the proper list depending on pool type and chance value
@@ -107,7 +108,7 @@ void PoolGroup<T>::DespawnObject(uint32 guid)
             if (!guid || EqualChanced[i].guid == guid)
             {
                 if (guid)
-                    CacheValue = EqualChanced[i].guid;
+                    m_LastDespawnedNode = EqualChanced[i].guid;
                 else
                     Despawn1Object(EqualChanced[i].guid);
 
@@ -184,9 +185,11 @@ void PoolGroup<T>::SpawnObject(uint32 limit, bool cache)
     if (limit == 1)                                         // This is the only case where explicit chance is used
     {
         uint32 roll = RollOne();
-        if (cache && CacheValue != roll)
-            Despawn1Object(CacheValue);
-        CacheValue = Spawn1Object(roll);
+        if (cache && m_LastDespawnedNode != roll)
+            Despawn1Object(m_LastDespawnedNode);
+
+        m_LastDespawnedNode = 0;
+        Spawn1Object(roll);
     }
     else if (limit < EqualChanced.size() && m_SpawnedPoolAmount < limit)
     {
@@ -199,10 +202,11 @@ void PoolGroup<T>::SpawnObject(uint32 limit, bool cache)
         {
             uint32 roll = urand(1, IndexList.size()) - 1;
             uint32 index = IndexList[roll];
-            if (!cache || (cache && EqualChanced[index].guid != CacheValue))
+            if (!cache || (cache && EqualChanced[index].guid != m_LastDespawnedNode))
             {
                 if (cache)
-                    Despawn1Object(CacheValue);
+                    Despawn1Object(m_LastDespawnedNode);
+
                 EqualChanced[index].spawned = Spawn1Object(EqualChanced[index].guid);
             }
             else
@@ -214,7 +218,7 @@ void PoolGroup<T>::SpawnObject(uint32 limit, bool cache)
             std::vector<uint32>::iterator itr = IndexList.begin()+roll;
             IndexList.erase(itr);
         }
-        CacheValue = 0;
+        m_LastDespawnedNode = 0;
     }
     else  // Not enough objects in pool, so spawn all
     {
@@ -333,7 +337,7 @@ bool PoolGroup<Pool>::ReSpawn1Object(uint32 /*guid*/)
 
 PoolHandler::PoolHandler()
 {
-    isSystemInit = false;
+    m_IsPoolSystemStarted = false;
 }
 
 void PoolHandler::LoadFromDB()
@@ -627,7 +631,7 @@ void PoolHandler::Initialize()
     }
 
     sLog.outBasic("Pool handling system initialized, %u pools spawned.", count);
-    isSystemInit = true;
+    m_IsPoolSystemStarted = true;
 }
 
 // Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
diff --git a/src/game/PoolHandler.h b/src/game/PoolHandler.h
index 7efdae480..652d8e2cf 100644
--- a/src/game/PoolHandler.h
+++ b/src/game/PoolHandler.h
@@ -56,9 +56,9 @@ class PoolGroup
         void RemoveOneRelation(uint16 child_pool_id);
     private:
         typedef std::vector<PoolObject> PoolObjectList;
-        uint32 CacheValue;                                  // Store the guid of the removed creature/gameobject during a pool update
         PoolObjectList ExplicitlyChanced;
         PoolObjectList EqualChanced;
+        uint32 m_LastDespawnedNode;                         // Store the guid of the removed creature/gameobject during a pool update
         uint32 m_SpawnedPoolAmount;                         // Used to know the number of spawned objects
 };
 
@@ -81,7 +81,7 @@ class PoolHandler
         void Initialize();
 
     protected:
-        bool isSystemInit;
+        bool m_IsPoolSystemStarted;
         uint16 max_pool_id;
         typedef std::vector<PoolTemplateData> PoolTemplateDataMap;
         typedef std::vector<PoolGroup<Creature> >   PoolGroupCreatureMap;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 4e7b7a18c..afba6ac2d 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8507"
+ #define REVISION_NR "8508"
 #endif // __REVISION_NR_H__