josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Movement: Fixed Facing* splines on transports

Browse Source
This commit is contained in:
Shauren
2012-06-03 15:31:37 +02:00
parent 7a5e4dd585
commit 3b44401aa6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Movement/Spline/MoveSplineInit.cpp
+8
View File
@@ -138,6 +138,14 @@ namespace Movement
void MoveSplineInit::SetFacing(float angle) void MoveSplineInit::SetFacing(float angle)
{ {
if (unit.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
{
if (Unit* vehicle = unit.GetVehicleBase())
angle -= vehicle->GetOrientation();
else if (Transport* transport = unit.GetTransport())
angle -= transport->GetOrientation();
}
args.facing.angle = G3D::wrap(angle, 0.f, (float)G3D::twoPi()); args.facing.angle = G3D::wrap(angle, 0.f, (float)G3D::twoPi());
args.flags.EnableFacingAngle(); args.flags.EnableFacingAngle();
} }
src/server/game/Movement/Spline/MoveSplineInit.h
+5 -3
View File
@@ -166,9 +166,11 @@ namespace Movement
inline void MoveSplineInit::SetFacing(Vector3 const& spot) inline void MoveSplineInit::SetFacing(Vector3 const& spot)
{ {
args.facing.f.x = spot.x; TransportPathTransform transform(unit);
args.facing.f.y = spot.y; Vector3 finalSpot = transform(spot);
args.facing.f.z = spot.z; args.facing.f.x = finalSpot.x;
args.facing.f.y = finalSpot.y;
args.facing.f.z = finalSpot.z;
args.flags.EnableFacingPoint(); args.flags.EnableFacingPoint();
} }
} }