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/scripts/Kalimdor | |
| 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/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_silithus.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_the_barrens.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 58665224bdd..a612269eff7 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -544,7 +544,7 @@ public: switch (AnimationCount) { case 0: - Talk(ANACHRONOS_SAY_1,Fandral->GetGUID()); + Talk(ANACHRONOS_SAY_1, Fandral->GetGUID()); break; case 1: Fandral->SetTarget(me->GetGUID()); diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 8f7ab09260b..b349de8f083 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -146,7 +146,7 @@ public: Talk(SAY_GIL_FREEBOOTERS, player->GetGUID()); break; case 37: - Talk(SAY_GIL_ALMOST,player->GetGUID()); + Talk(SAY_GIL_ALMOST, player->GetGUID()); break; case 47: Talk(SAY_GIL_SWEET, player->GetGUID()); |