diff options
| author | megamage <none@none> | 2009-02-25 20:52:20 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-25 20:52:20 -0600 |
| commit | bf66375bc73c2b9dd7c2d26d7af25b111734c622 (patch) | |
| tree | 67c3cf601faf32a03d16dfe7b02b2a938ec76ae7 /src/game/GridStates.cpp | |
| parent | ccde296fd3822898e8959c009211fe880a0429f7 (diff) | |
*Update active object code. By VladimirMangos.
--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 d38cd922537..bb47428553c 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); } } |