From 3dd6b69adba61b3c57be0050d1f220ffb4b255e5 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Thu, 26 Feb 2009 08:51:42 +0300 Subject: [PATCH] [7343] Fixed uninitilized lock fields for grid info. This must fix problem with unexpected lock grids data in memory with enabled grid unloading config setting. --- src/framework/GameSystem/NGrid.h | 6 ++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h index 0d6211243..469e47fb0 100644 --- a/src/framework/GameSystem/NGrid.h +++ b/src/framework/GameSystem/NGrid.h @@ -29,8 +29,10 @@ class GridInfo { public: - GridInfo() : i_timer(0) {} - GridInfo(time_t expiry, bool unload = true ) : i_timer(expiry), i_unloadExplicitLock(!unload) {} + GridInfo() + : i_timer(0), i_unloadActiveLockCount(0), i_unloadExplicitLock(false), i_unloadReferenceLock(false) {} + GridInfo(time_t expiry, bool unload = true ) + : i_timer(expiry), i_unloadActiveLockCount(0), i_unloadExplicitLock(!unload), i_unloadReferenceLock(false) {} const TimeTracker& getTimeTracker() const { return i_timer; } bool getUnloadLock() const { return i_unloadActiveLockCount || i_unloadExplicitLock || i_unloadReferenceLock; } void setUnloadExplicitLock( bool on ) { i_unloadExplicitLock = on; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 69bc7ff5a..23d3554d9 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 "7342" + #define REVISION_NR "7343" #endif // __REVISION_NR_H__