diff options
| author | Spp <spp@jorge.gr> | 2012-11-16 08:51:15 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-16 08:51:15 +0100 |
| commit | a0c8193ee7be188a0951ce6ee0bdafb1dee41e71 (patch) | |
| tree | 1020225dc168a154a9d788df950780b056e71910 /src/server/game/Movement | |
| parent | f13e57d9edb8664be746cf17d2ea36e24eca863e (diff) | |
| parent | d13ca54ecc991a7312f1584bdfdec32f8e6a0ee3 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Handlers/BattleGroundHandler.cpp
Diffstat (limited to 'src/server/game/Movement')
| -rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 20d7f57daca..70e4aad2967 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -208,7 +208,7 @@ bool MoveSplineInitArgs::Validate(Unit* unit) const #define CHECK(exp) \ if (!(exp))\ {\ - sLog->outError(LOG_FILTER_GENERAL, "MoveSplineInitArgs::Validate: expression '%s' failed for GUID: %u", #exp, unit->GetTypeId() == TYPEID_PLAYER ? unit->GetGUIDLow() : unit->ToCreature()->GetDBTableGUIDLow());\ + sLog->outError(LOG_FILTER_GENERAL, "MoveSplineInitArgs::Validate: expression '%s' failed for GUID: %u Entry: %u", #exp, unit->GetTypeId() == TYPEID_PLAYER ? unit->GetGUIDLow() : unit->ToCreature()->GetDBTableGUIDLow(), unit->GetEntry());\ return false;\ } CHECK(path.size() > 1); |