From c7cb95175d610ad7469694902d9cd6493d0417d8 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 3 Nov 2018 00:47:45 +0100
Subject: [PATCH] More refactoring and linux compile fix

---
 src/common/Common.h                                   | 2 +-
 src/servers/Scripts/common/CmnDefHousingSignboard.cpp | 2 +-
 src/servers/sapphire_zone/Zone/HousingZone.cpp        | 2 +-
 src/servers/sapphire_zone/Zone/Land.cpp               | 5 +++--
 src/servers/sapphire_zone/Zone/Land.h                 | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 4a3c5d4d..5d1fce2a 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -756,7 +756,6 @@ namespace Core::Common
     uint32_t fcIconColor; // 16
     uint16_t housePart[ 8 ]; // 34
     uint8_t color[ 8 ]; // 36
-    //44
   };
 
   struct HousePermissionSet
@@ -794,6 +793,7 @@ namespace Core::Common
     fcHouse,
     privateHouse
   };
+
   enum HouseIconAdd : uint8_t
   {
     heart = 0x06
diff --git a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
index 901c0f56..54cb765e 100644
--- a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
+++ b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
@@ -14,7 +14,7 @@ public:
 
   void Scene00000( Entity::Player& player )
   {
-    player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1 );
+    player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0 );
   }
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
diff --git a/src/servers/sapphire_zone/Zone/HousingZone.cpp b/src/servers/sapphire_zone/Zone/HousingZone.cpp
index 6dabcca9..fb2d5705 100644
--- a/src/servers/sapphire_zone/Zone/HousingZone.cpp
+++ b/src/servers/sapphire_zone/Zone/HousingZone.cpp
@@ -73,7 +73,7 @@ void Core::HousingZone::onPlayerZoneIn(Entity::Player& player)
 
     //TODO: Add Objects here
 
-    player.queuePacket(landsetYardInitializePacket);
+    player.queuePacket( landsetYardInitializePacket );
   }
 
 }
diff --git a/src/servers/sapphire_zone/Zone/Land.cpp b/src/servers/sapphire_zone/Zone/Land.cpp
index 1e80353a..2ad764c4 100644
--- a/src/servers/sapphire_zone/Zone/Land.cpp
+++ b/src/servers/sapphire_zone/Zone/Land.cpp
@@ -44,6 +44,7 @@ Core::Land::~Land()
 
 void Core::Land::load()
 {
+//  setPreset( 262145 );
 /*  auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
   auto res = pDb->query( "SELECT * FROM land WHERE Id = " + std::to_string( m_landKey ) );
   if( !res->next() )
@@ -199,7 +200,7 @@ uint32_t Core::Land::getLandKey()
   return m_landKey;
 }
 
-LandStruct Core::Land::getLand()
+const LandStruct& Core::Land::getLand()
 {
   return m_land;
 }
@@ -209,7 +210,7 @@ uint32_t Core::Land::getMaxItems()
   return m_maxItems;
 }
 
-void Core::Land::Init()
+void Core::Land::init()
 {
 
 
diff --git a/src/servers/sapphire_zone/Zone/Land.h b/src/servers/sapphire_zone/Zone/Land.h
index d0fae011..03a2641a 100644
--- a/src/servers/sapphire_zone/Zone/Land.h
+++ b/src/servers/sapphire_zone/Zone/Land.h
@@ -50,12 +50,12 @@ namespace Core
     void onUpdate();
     uint32_t getLandKey();
 
-    Common::LandStruct getLand();
+    const Common::LandStruct& getLand();
     uint32_t getMaxItems();
 
   private:
     uint16_t convertItemIdToHousingItemId( uint16_t itemId );
-    void Init();
+    void init();
 
     uint32_t m_landKey;
     uint8_t m_wardNum;