aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
authorKaelima <kaelima@live.se>2013-01-13 17:35:59 -0800
committerKaelima <kaelima@live.se>2013-01-13 17:35:59 -0800
commitc6f5bef468900c7b6b6b9a934732464d4faa8512 (patch)
tree1d054617e7a76ab7478222a4d3387e38e2603187 /src/server/game/Maps/Map.cpp
parent83c753f607ba98159ceb2391b4c2fb4aee374516 (diff)
parentbb995fcad1aa79b4e58301431e9f1f23db1aa2d6 (diff)
Merge pull request #8906 from ille/GridLock
Core/Maps: separate mutex for grid
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r--src/server/game/Maps/Map.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 286604c10ac..0eeb824103c 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -311,7 +311,7 @@ void Map::DeleteFromWorld(Player* player)
void Map::EnsureGridCreated(const GridCoord &p)
{
- TRINITY_GUARD(ACE_Thread_Mutex, Lock);
+ TRINITY_GUARD(ACE_Thread_Mutex, GridLock);
EnsureGridCreated_i(p);
}