mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00
Code Activity

Style

Browse source
This commit is contained in:
goaaats 2019-01-23 21:26:48 +01:00
parent 6894996fba
commit 54e60107e9
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/world/Actor/BNpc.cpp
View file

@ -211,7 +211,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
auto pNaviProvider = pNaviMgr->getNaviProvider( m_pCurrentZone->getInternalName() );
if(!pNaviProvider)
if( !pNaviProvider )
{
Logger::error( "No NaviProvider for zone#{0} - {1}", m_pCurrentZone->getGuId(), m_pCurrentZone->getInternalName() );
return false;

8
src/world/Manager/DebugCommandMgr.cpp
View file

@ -372,12 +372,12 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
auto inRange = player.getInRangeActors();
for( auto actor : inRange )
{
if( actor->getId() == player.getTargetId() && actor->getAsChara()->isAlive() )
{
if( actor->getId() == player.getTargetId() && actor->getAsChara()->isAlive() )
{
actor->getAsBNpc()->onActionHostile( player.getAsChara() );
}
actor->getAsBNpc()->onActionHostile( player.getAsChara() );
}
}
}
else
{

9
src/world/Navi/NaviProvider.h
View file

@ -55,15 +55,10 @@ namespace Sapphire
float m_polyFindRange[3];
private:
static int fixupCorridor( dtPolyRef* path, const int npath, const int maxPath,
const dtPolyRef* visited, const int nvisited );
static int fixupCorridor( dtPolyRef* path, const int npath, const int maxPath, const dtPolyRef* visited, const int nvisited );
static int fixupShortcuts( dtPolyRef* path, int npath, dtNavMeshQuery* navQuery );
inline static bool inRange( const float* v1, const float* v2, const float r, const float h );
static bool getSteerTarget( dtNavMeshQuery* navQuery, const float* startPos, const float* endPos,
const float minTargetDist,
const dtPolyRef* path, const int pathSize,
float* steerPos, unsigned char& steerPosFlag, dtPolyRef& steerPosRef,
float* outPoints = 0, int* outPointCount = 0 );
static bool getSteerTarget( dtNavMeshQuery* navQuery, const float* startPos, const float* endPos, const float minTargetDist, const dtPolyRef* path, const int pathSize, float* steerPos, unsigned char& steerPosFlag, dtPolyRef& steerPosRef, float* outPoints = 0, int* outPointCount = 0 );
};