diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-01-14 13:58:34 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-01-14 13:58:34 +0000 |
| commit | e6a07076c3b275c60598abd08e21444313e7a0da (patch) | |
| tree | 34426a1d3db102089407a2e978e90299e1c71303 /src/server/game/Maps/Map.cpp | |
| parent | b06c7e77858dcad0614c96f568126aee9966fa89 (diff) | |
| parent | c9ec5b4ce871bdeae446cbc86a4f88cee635ac53 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Movement/MotionMaster.cpp
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 3f811123805..9e6735efc26 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -326,7 +326,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); } |