mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Code Activity

refactor housepart to housemodel

Browse source
This commit is contained in:
NotAdam 2018-12-22 23:33:38 +11:00
parent f29e72942b
commit 32a8cccb12
5 changed files with 45 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/world/Manager/HousingMgr.cpp
View file

@ -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

12
src/world/Territory/House.cpp
View file

@ -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;
}

12
src/world/Territory/House.h
View file

@ -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;

3
src/world/Territory/Housing/HousingInteriorTerritory.cpp
View file

@ -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 ) );
}

42
src/world/Territory/Land.cpp
View file

@ -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;