From 14cbda944e62b982e0100571769065a8fefdf681 Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 29 Jan 2019 00:10:21 +0100 Subject: [PATCH] Quest mobs will be highlighted as such. Retreating mobs will have the target properly reset. Spawning range slightly decreased --- src/common/Common.h | 1 + src/world/Actor/BNpc.cpp | 4 ++-- src/world/Network/PacketWrappers/NpcSpawnPacket.h | 4 +++- src/world/ServerMgr.cpp | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 1735d54b..a18ce56a 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -18,6 +18,7 @@ namespace Sapphire::Common const uint8_t MAX_DISPLAYED_EOBJS = 40; const int32_t INVALID_GAME_OBJECT_ID = 0xE0000000; + const uint64_t INVALID_GAME_OBJECT_ID64 = 0xE0000000; struct FFXIVARR_POSITION3 { diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index faff1d45..2191e9c6 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -489,7 +489,7 @@ void Sapphire::Entity::BNpc::update( int64_t currTime ) if( distanceOrig > maxDistanceToOrigin ) { hateListClear(); - changeTarget( INVALID_GAME_OBJECT_ID ); + changeTarget( INVALID_GAME_OBJECT_ID64 ); setStance( Stance::Passive ); //setOwner( nullptr ); m_state = BNpcState::Retreat; @@ -508,7 +508,7 @@ void Sapphire::Entity::BNpc::update( int64_t currTime ) } else { - changeTarget( INVALID_GAME_OBJECT_ID ); + changeTarget( INVALID_GAME_OBJECT_ID64 ); setStance( Stance::Passive ); //setOwner( nullptr ); m_state = BNpcState::Retreat; diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h index 77d50e7e..fe01c415 100644 --- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h +++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h @@ -58,7 +58,9 @@ namespace Sapphire::Network::Packets::Server m_data.classJob = 0; - m_data.targetId = Common::INVALID_GAME_OBJECT_ID; + m_data.targetId = Common::INVALID_GAME_OBJECT_ID64; + m_data.spawnerId = Common::INVALID_GAME_OBJECT_ID64; + m_data.parentActorId = Common::INVALID_GAME_OBJECT_ID64; //m_data.u23 = 0x04; //m_data.u24 = 256; diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp index e5b0367f..7bbc28ec 100644 --- a/src/world/ServerMgr.cpp +++ b/src/world/ServerMgr.cpp @@ -101,7 +101,7 @@ bool Sapphire::World::ServerMgr::loadSettings( int32_t argc, char* argv[] ) m_config.network.disconnectTimeout = pConfig->getValue< uint16_t >( "Network", "DisconnectTimeout", 20 ); m_config.network.listenIp = pConfig->getValue< std::string >( "Network", "ListenIp", "0.0.0.0" ); m_config.network.listenPort = pConfig->getValue< uint16_t >( "Network", "ListenPort", 54992 ); - m_config.network.inRangeDistance = pConfig->getValue< float >( "Network", "InRangeDistance", 100.f ); + m_config.network.inRangeDistance = pConfig->getValue< float >( "Network", "InRangeDistance", 80.f ); m_config.motd = pConfig->getValue< std::string >( "General", "MotD", "" );