From 6af13f39a3c93ab648234b9eb6535f5e3539c98c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 7 Dec 2018 23:34:45 +1100
Subject: [PATCH] LandIdent now uses signed ints, rename housing
 clienttriggers, fix formatting

---
 src/common/Common.h                                       | 8 ++++----
 src/common/Network/CommonActorControl.h                   | 4 ++--
 src/servers/sapphire_zone/Inventory/ItemContainer.cpp     | 2 +-
 .../Network/Handlers/ClientTriggerHandler.cpp             | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index b4aa0760..14de2012 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -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
diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index f90c9a70..b5586709 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -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,
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
index e5ad2d1a..3328a4f9 100644
--- a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
+++ b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
@@ -12,7 +12,7 @@
 extern Sapphire::Framework g_fw;
 
 Sapphire::ItemContainer::ItemContainer( uint16_t storageId, uint16_t maxSize, const std::string& tableName,
-                                    bool isMultiStorage, bool isPersistentStorage ) :
+                                        bool isMultiStorage, bool isPersistentStorage ) :
   m_id( storageId ),
   m_size( maxSize ),
   m_tableName( tableName ),
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index 13c3f640..fcc6eb00 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -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 )