From d5b7520e227431f29957aba9030b82139abe7087 Mon Sep 17 00:00:00 2001
From: AriAvery <41122212+AriAvery@users.noreply.github.com>
Date: Mon, 16 Jul 2018 12:37:04 +0200
Subject: [PATCH] fixed style #3

---
 .../sapphire_zone/Zone/HousingZone.cpp        | 43 ++++++++++---------
 src/servers/sapphire_zone/Zone/HousingZone.h  |  2 +-
 src/servers/sapphire_zone/Zone/TerritoryMgr.h |  2 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/servers/sapphire_zone/Zone/HousingZone.cpp b/src/servers/sapphire_zone/Zone/HousingZone.cpp
index 840eba66..db6dc972 100644
--- a/src/servers/sapphire_zone/Zone/HousingZone.cpp
+++ b/src/servers/sapphire_zone/Zone/HousingZone.cpp
@@ -22,8 +22,8 @@ Core::HousingZone::HousingZone( uint8_t wardNum,
                                 uint16_t territoryId,
                                 uint32_t guId,
                                 const std::string& internalName,
-                                const std::string& contentName )
-   : Zone( territoryId, guId, internalName, contentName ),
+                                const std::string& contentName ) :
+     Zone( territoryId, guId, internalName, contentName ),
      m_wardNum( wardNum )
 {
 
@@ -49,41 +49,42 @@ Core::HousingZone::~HousingZone()
 void Core::HousingZone::onPlayerZoneIn( Entity::Player& player )
 {
    auto pLog = g_fw.get< Logger >();
-   pLog->debug( "HousingZone::onPlayerZoneIn: Zone#" + std::to_string(getGuId()) + "|" + 
+   pLog->debug( "HousingZone::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|" + 
       + ", Entity#" + std::to_string( player.getId() ) );
 
    uint32_t landSetId;
    uint32_t yardPacketNum;
+   uint32_t yardPacketTotal = 8;
 
-   auto wardInfoPackage = makeZonePacket< FFXIVIpcWardInfo >( player.getId() );
-   auto wardYardInfoPackage = makeZonePacket< FFXIVIpcWardYardInfo >( player.getId() );
+   auto wardInfoPacket = makeZonePacket< FFXIVIpcWardInfo >( player.getId() );
 
-   wardInfoPackage->data().wardNum = m_wardNum;
-   wardInfoPackage->data().zoneId = player.getZoneId();
+   wardInfoPacket->data().wardNum = m_wardNum;
+   wardInfoPacket->data().zoneId = player.getZoneId();
    //TODO: get current WorldId
-   wardInfoPackage->data().worldId = 67;
+   wardInfoPacket->data().worldId = 67;
    //TODO: handle Subdivision
-   wardInfoPackage->data().subInstance = 1;
+   wardInfoPacket->data().subInstance = 1;
 
    for( landSetId = 0; landSetId < 30 ; landSetId++ )
    {
-      wardInfoPackage->data().landSet[landSetId].houseSize = 1;
-      wardInfoPackage->data().landSet[landSetId].houseState = 1;
+      wardInfoPacket->data().landSet[landSetId].houseSize = 1;
+      wardInfoPacket->data().landSet[landSetId].houseState = 1;
    }
 
-   wardYardInfoPackage->data().unknown1 = 0xFFFFFFFF;
-   wardYardInfoPackage->data().unknown2 = 0xFFFFFFFF;
-   wardYardInfoPackage->data().unknown3 = 0xFF;
-   wardYardInfoPackage->data().packetTotal = 8;
+   player.queuePacket( wardInfoPacket );
 
-   player.queuePacket( wardInfoPackage );
-
-   for( yardPacketNum = 0; yardPacketNum < wardYardInfoPackage->data().packetTotal; yardPacketNum++ )
+   for( yardPacketNum = 0; yardPacketNum < yardPacketTotal; yardPacketNum++ )
    {
-      //Add Objects here
-      wardYardInfoPackage->data().packetNum = yardPacketNum;
+      auto wardYardInfoPacket = makeZonePacket< FFXIVIpcWardYardInfo >( player.getId() );
+      wardYardInfoPacket->data().unknown1 = 0xFFFFFFFF;
+      wardYardInfoPacket->data().unknown2 = 0xFFFFFFFF;
+      wardYardInfoPacket->data().unknown3 = 0xFF;
+      wardYardInfoPacket->data().packetNum = yardPacketNum;
+      wardYardInfoPacket->data().packetTotal = yardPacketTotal;
 
-      player.queuePacket( wardYardInfoPackage );
+      //TODO: Add Objects here
+
+      player.queuePacket( wardYardInfoPacket );
    }
 
 }
diff --git a/src/servers/sapphire_zone/Zone/HousingZone.h b/src/servers/sapphire_zone/Zone/HousingZone.h
index 2158b356..146ad8e2 100644
--- a/src/servers/sapphire_zone/Zone/HousingZone.h
+++ b/src/servers/sapphire_zone/Zone/HousingZone.h
@@ -17,7 +17,7 @@ class HousingZone : public Zone
       virtual ~HousingZone();
 
       bool init() override;
-      void onPlayerZoneIn(Entity::Player& player) override;
+      void onPlayerZoneIn( Entity::Player& player ) override;
 
 	   /* returns current ward number for this zone */
 	   uint8_t getWardNum() const;
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
index 49961953..dc72bc6b 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
@@ -91,7 +91,7 @@ namespace Core
       bool isDefaultTerritory( uint32_t territoryTypeId ) const;
 
       /*! returns true if the territoryType is a housing zone */
-      bool isHousingTerritory(uint32_t territoryTypeId) const;
+      bool isHousingTerritory( uint32_t territoryTypeId ) const;
 
       /*! creates a new instance for a given territoryTypeId */
       ZonePtr createTerritoryInstance( uint32_t territoryTypeId );