mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Code Activity

Some more targetId fixes

Browse source
This commit is contained in:
Mordred 2019-01-30 23:48:09 +01:00
parent 223e94e9bd
commit d5bb3c847e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -549,7 +549,7 @@ void Sapphire::Entity::BNpc::onActionHostile( Sapphire::Entity::CharaPtr pSource
void Sapphire::Entity::BNpc::onDeath() void Sapphire::Entity::BNpc::onDeath()
{ {
setTargetId( INVALID_GAME_OBJECT_ID ); setTargetId( INVALID_GAME_OBJECT_ID64 );
m_currentStance = Stance::Passive; m_currentStance = Stance::Passive;
m_state = BNpcState::Dead; m_state = BNpcState::Dead;
m_timeOfDeath = Util::getTimeSeconds(); m_timeOfDeath = Util::getTimeSeconds();

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

@ -37,7 +37,7 @@ using namespace Sapphire::Network::ActorControl;
Sapphire::Entity::Chara::Chara( ObjKind type, FrameworkPtr pFw ) : Sapphire::Entity::Chara::Chara( ObjKind type, FrameworkPtr pFw ) :
Actor( type ), Actor( type ),
m_pose( 0 ), m_pose( 0 ),
m_targetId( INVALID_GAME_OBJECT_ID ), m_targetId( INVALID_GAME_OBJECT_ID64 ),
m_pFw( std::move( std::move( pFw ) ) ) m_pFw( std::move( std::move( pFw ) ) )
{ {
// initialize the free slot queue // initialize the free slot queue

2
src/world/Network/PacketWrappers/NpcSpawnPacket.h
View file

@ -58,7 +58,7 @@ namespace Sapphire::Network::Packets::Server
m_data.classJob = 0; m_data.classJob = 0;
m_data.targetId = Common::INVALID_GAME_OBJECT_ID64; m_data.targetId = bnpc.getTargetId();
m_data.spawnerId = Common::INVALID_GAME_OBJECT_ID64; m_data.spawnerId = Common::INVALID_GAME_OBJECT_ID64;
m_data.parentActorId = Common::INVALID_GAME_OBJECT_ID64; m_data.parentActorId = Common::INVALID_GAME_OBJECT_ID64;