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

fix this stupid inconsistency where its sometimes 2 u8s, sometimes u16s

Browse source
This commit is contained in:
NotAdam 2018-12-19 01:03:41 +11:00
parent ebda186553
commit ab3c3a91cd
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/world/Manager/HousingMgr.cpp
View file

@ -450,13 +450,22 @@ void Sapphire::World::Manager::HousingMgr::requestEstateEditGuestAccess( Entity:
player.queuePacket( packet ); player.queuePacket( packet );
} }
Sapphire::Common::LandIdent Sapphire::World::Manager::HousingMgr::clientTriggerParamsToLandIdent( uint32_t param11, uint32_t param12 ) const Sapphire::Common::LandIdent Sapphire::World::Manager::HousingMgr::clientTriggerParamsToLandIdent( uint32_t param11, uint32_t param12, bool use16bits ) const
{ {
Common::LandIdent ident; Common::LandIdent ident;
ident.worldId = param11 >> 16; ident.worldId = param11 >> 16;
ident.territoryTypeId = param11 & 0xFFFF; ident.territoryTypeId = param11 & 0xFFFF;
ident.wardNum = (param12 >> 8) & 0xFF;
ident.landId = param12 & 0xFF; if( use16bits )
{
ident.wardNum = param12 >> 16;
ident.landId = param12 & 0xFFFF;
}
else
{
ident.wardNum = (param12 >> 8) & 0xFF;
ident.landId = param12 & 0xFF;
}
return ident; return ident;
} }

2
src/world/Manager/HousingMgr.h
View file

@ -33,7 +33,7 @@ namespace Sapphire::World::Manager
/*! /*!
* @brief Converts param1 of a client trigger into a Common::LandIndent * @brief Converts param1 of a client trigger into a Common::LandIndent
*/ */
Common::LandIdent clientTriggerParamsToLandIdent( uint32_t param11, uint32_t param12 ) const; Common::LandIdent clientTriggerParamsToLandIdent( uint32_t param11, uint32_t param12, bool use16bits = true ) const;
void sendWardLandInfo( Entity::Player& player, uint8_t wardId, uint16_t territoryTypeId ); void sendWardLandInfo( Entity::Player& player, uint8_t wardId, uint16_t territoryTypeId );

2
src/world/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -336,7 +336,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
{ {
auto pHousingMgr = g_fw.get< HousingMgr >(); auto pHousingMgr = g_fw.get< HousingMgr >();
auto ident = pHousingMgr->clientTriggerParamsToLandIdent( param11, param12 ); auto ident = pHousingMgr->clientTriggerParamsToLandIdent( param11, param12, false );
pHousingMgr->sendLandSignOwned( player, ident ); pHousingMgr->sendLandSignOwned( player, ident );
break; break;