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

LandIdent now uses signed ints, rename housing clienttriggers, fix formatting

Browse source
This commit is contained in:
NotAdam 2018-12-07 23:34:45 +11:00
parent 6ca213f437
commit 6af13f39a3
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/Common.h
View file

@ -803,10 +803,10 @@ namespace Sapphire::Common
struct LandIdent
{
uint16_t landId; //00
uint16_t wardNum; //02
uint16_t territoryTypeId; //04
uint16_t worldId; //06
int16_t landId; //00
int16_t wardNum; //02
int16_t territoryTypeId; //04
int16_t worldId; //06
};
struct LandFlagSet

4
src/common/Network/CommonActorControl.h
View file

@ -311,13 +311,13 @@ enum ActorControlType : uint16_t
RequestLandSignOwned = 0x452,
RequestWardLandInfo = 0x453,
RequestLandRelinquish = 0x454,
RequestExternalHousingInventory = 0x0458,
RequestHousingLandInventory = 0x0458,
RequestEstateRename = 0x45A,
RequestEstateEditGreeting = 0x45B,
RequestEstateGreeting = 0x45C, // sends FFXIVIpcHousingEstateGreeting in return
RequestEstateEditGuestAccessSettings = 0x45D,
RequestEstateTagSettings = 0x45F,
RequestInternalHousingInventory = 0x0461,
RequestHousingEstateInventory = 0x0461,
RequestHousingItemUI = 0x463,
RequestSharedEstateSettings = 0x46F,
UpdateEstateLightingLevel = 0x471,

4
src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -421,7 +421,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
break;
}
case ClientTriggerType::RequestExternalHousingInventory:
case ClientTriggerType::RequestHousingLandInventory:
{
if( param2 != 1 )
return;
@ -436,7 +436,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
break;
}
case ClientTriggerType::RequestInternalHousingInventory:
case ClientTriggerType::RequestHousingEstateInventory:
{
// only sent if param1 is 1, because the client sends this with 0 when you open the ui for whatever reason
if( param1 != 1 )