From f12a61f9f4117c63b26e7ffdc015286028d39490 Mon Sep 17 00:00:00 2001 From: linencloth Date: Fri, 17 Sep 2010 04:15:42 +0200 Subject: Core/Map: Log grid loading only if the grid was not already active --HG-- branch : trunk --- src/server/game/Maps/Map.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/server/game/Maps/Map.cpp') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 2edc516c427..71b97f59bf8 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -367,18 +367,18 @@ Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player) NGridType *grid = getNGrid(cell.GridX(), cell.GridY()); ASSERT(grid != NULL); - if (player) - { - sLog.outStaticDebug("Player %s enter cell[%u,%u] triggers loading of grid[%u,%u] on map %u", player->GetName(), cell.CellX(), cell.CellY(), cell.GridX(), cell.GridY(), GetId()); - } - else - { - sLog.outStaticDebug("Active object nearby triggers loading of grid [%u,%u] on map %u", cell.GridX(), cell.GridY(), GetId()); - } - // refresh grid state & timer if (grid->GetGridState() != GRID_STATE_ACTIVE) { + if (player) + { + sLog.outStaticDebug("Player %s enter cell[%u,%u] triggers loading of grid[%u,%u] on map %u", player->GetName(), cell.CellX(), cell.CellY(), cell.GridX(), cell.GridY(), GetId()); + } + else + { + sLog.outStaticDebug("Active object nearby triggers loading of grid [%u,%u] on map %u", cell.GridX(), cell.GridY(), GetId()); + } + ResetGridExpiry(*grid, 0.1f); grid->SetGridState(GRID_STATE_ACTIVE); } -- cgit v1.2.3