Core/CharacterDatabaseCleaner: Store character cleaning flags in World for runtime usage

--HG--
branch : trunk

3 files changed, 8 insertions, 0 deletions

diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
index 96e1d690213..7e6dcc64508 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
@@ -38,6 +38,7 @@ void CharacterDatabaseCleaner::CleanDatabase()
         return;
 
     uint32 flags = (*result)[0].GetUInt32();
+    sWorld->SetCleaningFlags(flags);
 
     // clean up
     if (flags & CLEANING_FLAG_ACHIEVEMENT_PROGRESS)
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 14fc52ec294..899c42ad355 100755
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -109,6 +109,8 @@ World::World()
     m_updateTimeCount = 0;
 
     m_isClosed = false;
+
+    m_CleaningFlags = 0;
 }
 
 /// World destructor
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index ce0afcb203a..6e5b6394fce 100755
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -737,6 +737,9 @@ class World
         bool GetEventKill() const { return isEventKillStart; }
 
         bool isEventKillStart;
+
+        uint32 GetCleaningFlags() { return m_CleaningFlags; }
+        void   SetCleaningFlags(uint32 flags) { m_CleaningFlags = flags; }
     protected:
         void _UpdateGameTime();
         // callback for UpdateRealmCharacters
@@ -754,6 +757,8 @@ class World
         uint32 m_ShutdownTimer;
         uint32 m_ShutdownMask;
 
+        uint32 m_CleaningFlags;
+
         bool m_isClosed;
 
         //atomic op counter for active scripts amount