From 32a8cccb12de615d651f2c79cf122fe1c7df6ade Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sat, 22 Dec 2018 23:33:38 +1100 Subject: [PATCH] refactor housepart to housemodel --- src/world/Manager/HousingMgr.cpp | 5 ++- src/world/Territory/House.cpp | 12 +++--- src/world/Territory/House.h | 12 +++--- .../Housing/HousingInteriorTerritory.cpp | 3 +- src/world/Territory/Land.cpp | 42 ++++++++++++------- 5 files changed, 45 insertions(+), 29 deletions(-) diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp index 1be326fd..cb4ff6f7 100644 --- a/src/world/Manager/HousingMgr.cpp +++ b/src/world/Manager/HousingMgr.cpp @@ -680,7 +680,7 @@ void Sapphire::World::Manager::HousingMgr::updateHouseModels( Sapphire::HousePtr { for( auto& item : extContainer->second->getItemMap() ) { - house->setHousePart( static_cast< Common::HousePartSlot >( item.first ), getItemData( item.second->getId() ) ); + house->setHouseModel( static_cast< Common::HousePartSlot >( item.first ), getItemData( item.second->getId() ) ); } } else @@ -693,7 +693,8 @@ void Sapphire::World::Manager::HousingMgr::updateHouseModels( Sapphire::HousePtr { for( auto& item : intContainer->second->getItemMap() ) { - house->setHouseInteriorPart( static_cast< Common::HousingInteriorSlot >( item.first ), getItemData( item.second->getId() ) ); + house->setHouseInteriorModel( static_cast< Common::HousingInteriorSlot >( item.first ), + getItemData( item.second->getId() ) ); } } else diff --git a/src/world/Territory/House.cpp b/src/world/Territory/House.cpp index 404f9f47..ebacabe0 100644 --- a/src/world/Territory/House.cpp +++ b/src/world/Territory/House.cpp @@ -60,32 +60,32 @@ uint32_t Sapphire::House::getHouseId() const return m_houseId; } -uint8_t Sapphire::House::getHousePartColor( Common::HousePartSlot slot ) const +uint8_t Sapphire::House::getHouseModelColor( Common::HousePartSlot slot ) const { return m_houseModelsCache[ slot ].second; } -uint32_t Sapphire::House::getHouseInteriorPart( Common::HousingInteriorSlot slot ) const +uint32_t Sapphire::House::getHouseInteriorModel( Common::HousingInteriorSlot slot ) const { return m_houseInteriorModels[ slot ]; } -void Sapphire::House::setHousePart( Common::HousePartSlot slot, uint32_t id ) +void Sapphire::House::setHouseModel( Common::HousePartSlot slot, uint32_t id ) { m_houseModelsCache[ slot ].first = id; } -void Sapphire::House::setHousePartColor( Common::HousePartSlot slot, uint32_t id ) +void Sapphire::House::setHouseModelColor( Common::HousePartSlot slot, uint32_t id ) { m_houseModelsCache[ slot ].second = id; } -void Sapphire::House::setHouseInteriorPart( Common::HousingInteriorSlot slot, uint32_t id ) +void Sapphire::House::setHouseInteriorModel( Common::HousingInteriorSlot slot, uint32_t id ) { m_houseInteriorModels[ slot ] = id; } -uint32_t Sapphire::House::getHousePart( Common::HousePartSlot slot ) const +uint32_t Sapphire::House::getHouseModel( Common::HousePartSlot slot ) const { return m_houseModelsCache[ slot ].first; } diff --git a/src/world/Territory/House.h b/src/world/Territory/House.h index f4c71817..c45e30db 100644 --- a/src/world/Territory/House.h +++ b/src/world/Territory/House.h @@ -31,12 +31,12 @@ namespace Sapphire void setHouseGreeting( const std::string& greeting ); //functions - void setHousePart( Common::HousePartSlot slot, uint32_t id ); - void setHousePartColor( Common::HousePartSlot slot, uint32_t id ); - void setHouseInteriorPart( Common::HousingInteriorSlot slot, uint32_t id ); - uint32_t getHousePart( Common::HousePartSlot slot ) const; - uint8_t getHousePartColor( Common::HousePartSlot slot ) const; - uint32_t getHouseInteriorPart( Common::HousingInteriorSlot slot ) const; + void setHouseModel( Common::HousePartSlot slot, uint32_t id ); + void setHouseModelColor( Common::HousePartSlot slot, uint32_t id ); + void setHouseInteriorModel( Common::HousingInteriorSlot slot, uint32_t id ); + uint32_t getHouseModel( Common::HousePartSlot slot ) const; + uint8_t getHouseModelColor( Common::HousePartSlot slot ) const; + uint32_t getHouseInteriorModel( Common::HousingInteriorSlot slot ) const; HouseModelsArray const& getHouseModels() const; diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp index da5c399d..e1b87f46 100644 --- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp +++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp @@ -68,7 +68,8 @@ void Housing::HousingInteriorTerritory::onPlayerZoneIn( Entity::Player& player ) for( auto i = 0; i < 10; i++ ) { - indoorInitPacket->data().indoorItems[ i ] = pHouse->getHouseInteriorPart( static_cast< Common::HousingInteriorSlot >( i ) ); + indoorInitPacket->data().indoorItems[ i ] = pHouse->getHouseInteriorModel( + static_cast< Common::HousingInteriorSlot >( i ) ); } diff --git a/src/world/Territory/Land.cpp b/src/world/Territory/Land.cpp index 4a1d075a..aaa4ef63 100644 --- a/src/world/Territory/Land.cpp +++ b/src/world/Territory/Land.cpp @@ -313,21 +313,35 @@ bool Sapphire::Land::setPreset( uint32_t itemId ) } - getHouse()->setHousePart( Common::HousePartSlot::ExteriorRoof, convertItemIdToHousingItemId( housingPreset->exteriorRoof ) ); - getHouse()->setHousePart( Common::HousePartSlot::ExteriorWall, convertItemIdToHousingItemId( housingPreset->exteriorWall ) ); - getHouse()->setHousePart( Common::HousePartSlot::ExteriorWindow, convertItemIdToHousingItemId( housingPreset->exteriorWindow ) ); - getHouse()->setHousePart( Common::HousePartSlot::ExteriorDoor, convertItemIdToHousingItemId( housingPreset->exteriorDoor ) ); + getHouse()->setHouseModel( Common::HousePartSlot::ExteriorRoof, + convertItemIdToHousingItemId( housingPreset->exteriorRoof ) ); + getHouse()->setHouseModel( Common::HousePartSlot::ExteriorWall, + convertItemIdToHousingItemId( housingPreset->exteriorWall ) ); + getHouse()->setHouseModel( Common::HousePartSlot::ExteriorWindow, + convertItemIdToHousingItemId( housingPreset->exteriorWindow ) ); + getHouse()->setHouseModel( Common::HousePartSlot::ExteriorDoor, + convertItemIdToHousingItemId( housingPreset->exteriorDoor ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorWall, convertItemIdToHousingItemId( housingPreset->interiorWall ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorFloor, convertItemIdToHousingItemId( housingPreset->interiorFlooring ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorLight, convertItemIdToHousingItemId( housingPreset->interiorLighting ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorWall_Attic, convertItemIdToHousingItemId( housingPreset->otherFloorWall ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorFloor_Attic, convertItemIdToHousingItemId( housingPreset->otherFloorFlooring ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorLight_Attic, convertItemIdToHousingItemId( housingPreset->otherFloorLighting ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorWall_Basement, convertItemIdToHousingItemId( housingPreset->basementWall ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorFloor_Basement, convertItemIdToHousingItemId( housingPreset->basementFlooring ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorLight_Basement, convertItemIdToHousingItemId( housingPreset->basementLighting ) ); - getHouse()->setHouseInteriorPart( Common::HousingInteriorSlot::InteriorLight_Mansion, convertItemIdToHousingItemId( housingPreset->mansionLighting ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorWall, + convertItemIdToHousingItemId( housingPreset->interiorWall ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorFloor, + convertItemIdToHousingItemId( housingPreset->interiorFlooring ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorLight, + convertItemIdToHousingItemId( housingPreset->interiorLighting ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorWall_Attic, + convertItemIdToHousingItemId( housingPreset->otherFloorWall ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorFloor_Attic, + convertItemIdToHousingItemId( housingPreset->otherFloorFlooring ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorLight_Attic, + convertItemIdToHousingItemId( housingPreset->otherFloorLighting ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorWall_Basement, + convertItemIdToHousingItemId( housingPreset->basementWall ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorFloor_Basement, + convertItemIdToHousingItemId( housingPreset->basementFlooring ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorLight_Basement, + convertItemIdToHousingItemId( housingPreset->basementLighting ) ); + getHouse()->setHouseInteriorModel( Common::HousingInteriorSlot::InteriorLight_Mansion, + convertItemIdToHousingItemId( housingPreset->mansionLighting ) ); return true;