diff options
| -rw-r--r-- | src/server/game/Entities/Object/MovementInfo.h | 5 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/MovementPackets.cpp | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/server/game/Entities/Object/MovementInfo.h b/src/server/game/Entities/Object/MovementInfo.h index f587d71e710..15b4af8ebfa 100644 --- a/src/server/game/Entities/Object/MovementInfo.h +++ b/src/server/game/Entities/Object/MovementInfo.h @@ -84,11 +84,10 @@ struct MovementInfo } jump; - // spline - float splineElevation; + float stepUpStartElevation; MovementInfo() : - flags(0), flags2(0), flags3(0), time(0), pitch(0.0f), splineElevation(0.0f) + flags(0), flags2(0), flags3(0), time(0), pitch(0.0f), stepUpStartElevation(0.0f) { pos.Relocate(0.0f, 0.0f, 0.0f, 0.0f); transport.Reset(); diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 8eb453f78dd..1059e2d7686 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -307,7 +307,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, CreateObjectBits flags, Playe *data << float(unit->GetOrientation()); *data << float(unit->m_movementInfo.pitch); // Pitch - *data << float(unit->m_movementInfo.splineElevation); // StepUpStartElevation + *data << float(unit->m_movementInfo.stepUpStartElevation); // StepUpStartElevation *data << uint32(0); // RemoveForcesIDs.size() *data << uint32(0); // MoveIndex @@ -818,7 +818,7 @@ void MovementInfo::OutDebug() } if (flags & MOVEMENTFLAG_SPLINE_ELEVATION) - TC_LOG_DEBUG("misc", "splineElevation: %f", splineElevation); + TC_LOG_DEBUG("misc", "stepUpStartElevation: %f", stepUpStartElevation); } WorldObject::WorldObject(bool isWorldObject) : Object(), WorldLocation(), LastUsedScriptID(0), diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6ca76288d1f..90a414e6ad7 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -27627,10 +27627,10 @@ void Player::ValidateMovementInfo(MovementInfo* mi) REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_CAN_FLY) && mi->HasMovementFlag(MOVEMENTFLAG_FALLING), MOVEMENTFLAG_FALLING); - REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION) && G3D::fuzzyEq(mi->splineElevation, 0.0f), MOVEMENTFLAG_SPLINE_ELEVATION); + REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION) && G3D::fuzzyEq(mi->stepUpStartElevation, 0.0f), MOVEMENTFLAG_SPLINE_ELEVATION); // Client first checks if spline elevation != 0, then verifies flag presence - if (G3D::fuzzyNe(mi->splineElevation, 0.0f)) + if (G3D::fuzzyNe(mi->stepUpStartElevation, 0.0f)) mi->AddMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION); #undef REMOVE_VIOLATING_FLAGS diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index 61e3339a3ad..c631249f01a 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -37,7 +37,7 @@ ByteBuffer& operator<<(ByteBuffer& data, MovementInfo const& movementInfo) data << uint32(movementInfo.time); data << movementInfo.pos.PositionXYZOStream(); data << float(movementInfo.pitch); - data << float(movementInfo.splineElevation); + data << float(movementInfo.stepUpStartElevation); uint32 removeMovementForcesCount = 0; data << removeMovementForcesCount; @@ -99,7 +99,7 @@ ByteBuffer& operator>>(ByteBuffer& data, MovementInfo& movementInfo) data >> movementInfo.time; data >> movementInfo.pos.PositionXYZOStream(); data >> movementInfo.pitch; - data >> movementInfo.splineElevation; + data >> movementInfo.stepUpStartElevation; uint32 removeMovementForcesCount; data >> removeMovementForcesCount; |