From aa70c9775f9a3e637ee9cff31e84fb6b8f42403b Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Dec 2018 20:24:20 +1100
Subject: [PATCH] minor refactoring and zero out model cache arrays on init

---
 src/world/Territory/House.cpp |  7 +++++--
 src/world/Territory/House.h   | 10 ++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/world/Territory/House.cpp b/src/world/Territory/House.cpp
index fe08783d..def91bc6 100644
--- a/src/world/Territory/House.cpp
+++ b/src/world/Territory/House.cpp
@@ -19,7 +19,10 @@ Sapphire::House::House( uint32_t houseId, uint32_t landSetId, Common::LandIdent
   m_estateName( estateName ),
   m_estateComment( estateComment ),
   m_pFw( pFw )
-{}
+{
+  m_interiorModelCache.fill( 0 );
+  m_exteriorModelCache.fill( std::make_pair( 0, 0 ) );
+}
 
 Sapphire::House::~House() = default;
 
@@ -57,7 +60,7 @@ uint32_t Sapphire::House::getId() const
   return m_houseId;
 }
 
-Sapphire::House::HouseModelsArray const& Sapphire::House::getHouseModels() const
+Sapphire::House::ExteriorModelsArray const& Sapphire::House::getHouseModels() const
 {
   return m_exteriorModelCache;
 }
diff --git a/src/world/Territory/House.h b/src/world/Territory/House.h
index 21d3ea86..1fa0ca43 100644
--- a/src/world/Territory/House.h
+++ b/src/world/Territory/House.h
@@ -5,6 +5,7 @@
 #include <Common.h>
 #include <set>
 #include <unordered_map>
+#include <array>
 
 namespace Sapphire
 {
@@ -17,7 +18,8 @@ namespace Sapphire
     virtual ~House();
 
     using HousePart = std::pair< uint32_t, uint16_t >;
-    using HouseModelsArray = std::array< HousePart, 8 >;
+    using ExteriorModelsArray = std::array< HousePart, 8 >;
+    using InteriorModelsArray = std::array< uint32_t, 10 >;
 
     //gerneral
     uint32_t getLandSetId() const;
@@ -37,7 +39,7 @@ namespace Sapphire
     void setInteriorModel( Common::HouseInteriorSlot slot, uint32_t modelId );
     uint32_t getInteriorModel( Common::HouseInteriorSlot slot );
 
-    HouseModelsArray const& getHouseModels() const;
+    ExteriorModelsArray const& getHouseModels() const;
 
     void updateHouseDb();
 
@@ -52,8 +54,8 @@ namespace Sapphire
     uint64_t m_buildTime;
     bool m_hasAetheryte;
 
-    HouseModelsArray m_exteriorModelCache;
-    uint32_t m_interiorModelCache[10];
+    ExteriorModelsArray m_exteriorModelCache;
+    InteriorModelsArray m_interiorModelCache;
 
     std::string m_estateComment;
     std::string m_estateName;