From aa0b4ab7f51707421dc5b8a5c1c5600e54fb79a7 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 19 Jun 2022 00:07:09 +0200 Subject: [PATCH] Core/Misc: resolved more cherrypick mistakes --- src/server/game/Entities/Transport/Transport.cpp | 2 -- src/server/game/Movement/Spline/Spline.h | 2 ++ .../Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 424285b9bca..3971e6f7cdb 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -650,8 +650,6 @@ void Transport::DelayedTeleportTransport() PassengerSet passengersToTeleport = _passengers; for (WorldObject* obj : passengersToTeleport) { - WorldObject* obj = (*_passengerTeleportItr++); - float destX, destY, destZ, destO; obj->m_movementInfo.transport.pos.GetPosition(destX, destY, destZ, destO); TransportBase::CalculatePassengerPosition(destX, destY, destZ, &destO, x, y, z, o); diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index 29fa362083b..53f22e1047b 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -160,6 +160,8 @@ public: @param t - percent of spline's length, assumes that t in range [0, 1]. */ void evaluate_derivative(float t, Vector3& hermite) const; + using SplineBase::evaluate_derivative; + // Assumes that t in range [0, 1] index_type computeIndexInBounds(float t) const; void computeIndex(float t, index_type& out_idx, float& out_u) const; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 275adb3ab72..e5175d74894 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -750,7 +750,7 @@ class instance_icecrown_citadel : public InstanceMapScript if (GameObject* teleporter = instance->GetGameObject(TeleporterRampartsGUID)) SetTeleporterState(teleporter, true); - if (Transport* elevator = instance->GetTransport(LadyDeathwisperElevatorGUID)) + if (GameObject* elevator = instance->GetGameObject(LadyDeathwisperElevatorGUID)) { elevator->SetGoState(GO_STATE_TRANSPORT_ACTIVE); elevator->HandleCustomTypeCommand(GameObjectType::SetTransportAutoCycleBetweenStopFrames(true));