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

Added worldId to Examine, and world name properly displays

Browse source 
World name displays in the HUD and in the Examine window
This commit is contained in:
JeidoUran 2019-04-17 00:31:19 +02:00
parent ae103131bd
commit 1cc0573e66
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1039,7 +1039,9 @@ namespace Sapphire::Network::Packets::Server
char padding1[8]; char padding1[8];
uint64_t mainWeaponModel; uint64_t mainWeaponModel;
uint64_t secWeaponModel; uint64_t secWeaponModel;
char unknown2[16]; uint8_t unknown2;
uint16_t worldId;
char unknown3[12];
struct ItemData struct ItemData
{ {
uint32_t catalogId; uint32_t catalogId;

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

@ -49,6 +49,8 @@ namespace Sapphire::Network::Packets::Server
m_data.mainWeaponModel = pTarget->getModelMainWeapon(); m_data.mainWeaponModel = pTarget->getModelMainWeapon();
m_data.secWeaponModel = pTarget->getModelSubWeapon(); m_data.secWeaponModel = pTarget->getModelSubWeapon();
m_data.worldId = 67; // TODO: world id from server
memcpy( m_data.look, pTarget->getLookArray(), sizeof( m_data.look ) ); memcpy( m_data.look, pTarget->getLookArray(), sizeof( m_data.look ) );
m_data.models[ Common::GearModelSlot::ModelHead ] = pTarget->getModelForSlot( Common::GearModelSlot::ModelHead ); m_data.models[ Common::GearModelSlot::ModelHead ] = pTarget->getModelForSlot( Common::GearModelSlot::ModelHead );

4
src/world/Network/PacketWrappers/PlayerSpawnPacket.h
View file

@ -31,6 +31,10 @@ namespace Sapphire::Network::Packets::Server
m_data.classJob = static_cast< uint8_t >( player.getClass() ); m_data.classJob = static_cast< uint8_t >( player.getClass() );
//m_data.status = static_cast< uint8_t >( pPlayer->getStatus() ); //m_data.status = static_cast< uint8_t >( pPlayer->getStatus() );
// TODO: world id from server
m_data.currentWorldId = 67;
m_data.homeWorldId = 67;
m_data.hPCurr = player.getHp(); m_data.hPCurr = player.getHp();
m_data.mPCurr = player.getMp(); m_data.mPCurr = player.getMp();
m_data.tPCurr = player.getTp(); m_data.tPCurr = player.getTp();