From 6eb1ebaa0a7dbf86a9f519acb34b824bc1fb4747 Mon Sep 17 00:00:00 2001 From: mordred Date: Thu, 24 Jan 2019 13:15:30 +0100 Subject: [PATCH] Slightly simplified path calculation --- src/world/Actor/BNpc.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index d4c93678..1a9a3f0d 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -179,19 +179,14 @@ void Sapphire::Entity::BNpc::step() } // This is probably not a good way to do it but works fine for now - float rot = Util::calcAngFrom( getPos().x, getPos().z, stepPos.x, stepPos.z ); - float newRot = PI - rot + ( PI / 2 ); - - face( stepPos ); float angle = Util::calcAngFrom( getPos().x, getPos().z, stepPos.x, stepPos.z ) + PI; auto x = ( cosf( angle ) * 1.1f ); - auto y = ( getPos().y + stepPos.y ) * 0.5f; // Get speed from somewhere else? + auto y = stepPos.y; auto z = ( sinf( angle ) * 1.1f ); - Common::FFXIVARR_POSITION3 newPos{ getPos().x + x, y, getPos().z + z }; - setPos( newPos ); - setRot( newRot ); + setPos( { getPos().x + x, y, getPos().z + z } ); + face( stepPos ); sendPositionUpdate(); }