diff options
| author | megamage <none@none> | 2009-02-26 20:43:35 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-26 20:43:35 -0600 |
| commit | d3a69006675bb5317fab76584d5990b36c2fd5a5 (patch) | |
| tree | 8a0f3e0033eb694d5aba06db5c1ecc02b690099e /src/game/GridStates.cpp | |
| parent | 39c513776c5dde8b5732df5ba2467d9e9e3e84fd (diff) | |
| parent | bc54e91afff9b9a53902439441fa2e63e3da1a9a (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GridStates.cpp')
| -rw-r--r-- | src/game/GridStates.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp index cedec1de60f..92054e5948a 100644 --- a/src/game/GridStates.cpp +++ b/src/game/GridStates.cpp @@ -60,14 +60,14 @@ IdleState::Update(Map &m, NGridType &grid, GridInfo &, const uint32 &x, const ui void RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, const uint32 &y, const uint32 &t_diff) const { - if(info.getUnloadFlag()) + if(!info.getUnloadLock()) { info.UpdateTimeTracker(t_diff); if( info.getTimeTracker().Passed() ) { if( !m.UnloadGrid(x, y, false) ) { - sLog.outDebug("Grid[%u,%u] for map %u differed unloading due to players nearby", x, y, m.GetId()); + sLog.outDebug("Grid[%u,%u] for map %u differed unloading due to players or active objects nearby", x, y, m.GetId()); m.ResetGridExpiry(grid); } } |