From 9712f94d00e1bc07201d88b40d38d4ac26a3fbc3 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sat, 19 Jan 2019 19:28:12 +1100 Subject: [PATCH] cleanup spawn slot handling for bnpcs --- .../Network/PacketWrappers/NpcSpawnPacket.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h index ce6a0005..dc4f9402 100644 --- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h +++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h @@ -76,17 +76,14 @@ namespace Sapphire::Network::Packets::Server m_data.bNPCName = bnpc.getBNpcNameId(); m_data.state = 1; - if( target.getId() == bnpc.getId() ) - { - m_data.spawnIndex = 0x00; - } - else - { - m_data.spawnIndex = target.getSpawnIdForActorId( bnpc.getId() ); - if( !target.isActorSpawnIdValid( m_data.spawnIndex ) ) - return; - } + assert( target.getId() != bnpc.getId() ); + + m_data.spawnIndex = target.getSpawnIdForActorId( bnpc.getId() ); + + if( !target.isActorSpawnIdValid( m_data.spawnIndex ) ) + return; + // 0x20 == spawn hidden to be displayed by the spawneffect control //m_data.displayFlags = bnpc.getDisplayFlags();