From 5db5b09e40b48141668023c12129033063203a98 Mon Sep 17 00:00:00 2001 From: AriAvery <41122212+AriAvery@users.noreply.github.com> Date: Sat, 10 Nov 2018 19:00:41 +0100 Subject: [PATCH] House fixes 2 --- src/common/Common.h | 15 ++++++++++++++- src/servers/sapphire_zone/ForwardsZone.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/common/Common.h b/src/common/Common.h index 1596cfe4..fe183346 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -26,6 +26,12 @@ namespace Core::Common float z; }; + struct ActiveLand + { + uint8_t ward; + uint8_t plot; + }; + enum InventoryOperation : uint8_t { Discard = 0x07, @@ -745,6 +751,13 @@ namespace Core::Common YardSign }; + enum HouseTagSlot + { + MainTag, + SubTag1, + SubTag2 + }; + //Structs struct LandStruct { @@ -770,7 +783,7 @@ namespace Core::Common struct LandPermissionSet { - int16_t landSetId; //00 + int16_t landId; //00 int16_t wardNum; //02 int16_t zoneId; //04 int16_t worldId; //06 diff --git a/src/servers/sapphire_zone/ForwardsZone.h b/src/servers/sapphire_zone/ForwardsZone.h index 51fb9997..566b8856 100644 --- a/src/servers/sapphire_zone/ForwardsZone.h +++ b/src/servers/sapphire_zone/ForwardsZone.h @@ -20,6 +20,7 @@ namespace Core { TYPE_FORWARD( Cell ); TYPE_FORWARD( Zone ); TYPE_FORWARD( HousingZone ); +TYPE_FORWARD( HousingMgr ); TYPE_FORWARD( InstanceContent ); TYPE_FORWARD( Item ); TYPE_FORWARD( ItemContainer );