Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
This commit is contained in:
Nay committed 2012-09-10 00:52:35 +01:00
commit d6743c7c95
15 files changed
+144 -27

No files matched your search

@@ -193,17 +193,9 @@ namespace Movement
{
if (_transformForTransport)
{
if (Unit* vehicle = _owner.GetVehicleBase())
{
input.x -= vehicle->GetPositionX();
input.y -= vehicle->GetPositionY();
input.z -= vehicle->GetPositionZMinusOffset();
}
else if (Transport* transport = _owner.GetTransport())
{
float unused = 0.0f;
float unused = 0.0f;
if (TransportBase* transport = _owner.GetDirectTransport())
transport->CalculatePassengerOffset(input.x, input.y, input.z, unused);
}
}
return input;