From f81746654c887401695b50b9ee9fe017db40d53e Mon Sep 17 00:00:00 2001 From: NotAdam Date: Mon, 14 Jan 2019 21:32:40 +1100 Subject: [PATCH] Move housingmgr to u8s for inv slots instead of u16s --- src/world/Manager/HousingMgr.cpp | 14 +++++++------- src/world/Manager/HousingMgr.h | 15 +++++++-------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp index efa3f162..623c6073 100644 --- a/src/world/Manager/HousingMgr.cpp +++ b/src/world/Manager/HousingMgr.cpp @@ -956,7 +956,7 @@ bool Sapphire::World::Manager::HousingMgr::isPlacedItemsInventory( Sapphire::Com } void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity::Player& player, uint16_t landId, - uint16_t containerId, uint16_t slotId, + uint16_t containerId, uint8_t slotId, Sapphire::Common::FFXIVARR_POSITION3 pos, float rotation ) { @@ -1038,7 +1038,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity } void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity::Player& player, uint16_t landId, - uint16_t containerId, uint16_t slotId ) + uint16_t containerId, uint8_t slotId ) { LandPtr land; bool isOutside = false; @@ -1229,7 +1229,7 @@ void Sapphire::World::Manager::HousingMgr::sendInternalEstateInventoryBatch( Sap } void Sapphire::World::Manager::HousingMgr::reqMoveHousingItem( Entity::Player& player, - Common::LandIdent ident, uint16_t slot, + Common::LandIdent ident, uint8_t slot, Common::FFXIVARR_POSITION3 pos, float rot ) { auto landSet = toLandSetId( ident.territoryTypeId, ident.wardNum ); @@ -1254,7 +1254,7 @@ void Sapphire::World::Manager::HousingMgr::reqMoveHousingItem( Entity::Player& p } bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& player, Common::LandIdent ident, - Territory::Housing::HousingInteriorTerritory& terri, uint16_t slot, + Territory::Housing::HousingInteriorTerritory& terri, uint8_t slot, Common::FFXIVARR_POSITION3 pos, float rot ) { auto containerIdx = static_cast< uint16_t >( slot / 50 ); @@ -1300,7 +1300,7 @@ bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& pla } bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& player, - Common::LandIdent ident, uint16_t slot, + Common::LandIdent ident, uint8_t slot, Sapphire::HousingZone& terri, Common::FFXIVARR_POSITION3 pos, float rot ) { @@ -1336,7 +1336,7 @@ bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& pla } void Sapphire::World::Manager::HousingMgr::reqRemoveHousingItem( Sapphire::Entity::Player& player, uint16_t plot, - uint16_t containerId, uint16_t slot, + uint16_t containerId, uint8_t slot, bool sendToStoreroom ) { if( auto terri = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() ) ) @@ -1456,7 +1456,7 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p } bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& player, HousingZone& terri, Land& land, - Common::InventoryType containerType, uint16_t slotId, + Common::InventoryType containerType, uint8_t slotId, bool sendToStoreroom ) { auto& containers = getEstateInventory( land.getLandIdent() ); diff --git a/src/world/Manager/HousingMgr.h b/src/world/Manager/HousingMgr.h index 8167efb9..cd81255e 100644 --- a/src/world/Manager/HousingMgr.h +++ b/src/world/Manager/HousingMgr.h @@ -156,10 +156,10 @@ namespace Sapphire::World::Manager */ bool initHouseModels( Entity::Player& player, LandPtr land, uint32_t presetCatalogId ); - void reqPlaceHousingItem( Entity::Player& player, uint16_t landId, uint16_t containerId, uint16_t slotId, + void reqPlaceHousingItem( Entity::Player& player, uint16_t landId, uint16_t containerId, uint8_t slotId, Common::FFXIVARR_POSITION3 pos, float rotation ); - void reqPlaceItemInStore( Entity::Player& player, uint16_t landId, uint16_t containerId, uint16_t slotId ); + void reqPlaceItemInStore( Entity::Player& player, uint16_t landId, uint16_t containerId, uint8_t slotId ); /*! * @brief Returns the equivalent YardObject for a HousingItem @@ -169,13 +169,12 @@ namespace Sapphire::World::Manager Common::HousingObject getYardObjectForItem( Inventory::HousingItemPtr item ) const; - void reqMoveHousingItem( Entity::Player& player, Common::LandIdent ident, uint16_t slot, + void reqMoveHousingItem( Entity::Player& player, Common::LandIdent ident, uint8_t slot, Common::FFXIVARR_POSITION3 pos, float rot ); void reqRemoveHousingItem( Sapphire::Entity::Player& player, uint16_t plot, - uint16_t containerId, uint16_t slot, - bool sendToStoreroom ); + uint16_t containerId, uint8_t slot, bool sendToStoreroom ); void reqEstateExteriorRemodel( Entity::Player& player, uint16_t plot ); @@ -212,7 +211,7 @@ namespace Sapphire::World::Manager * @return */ bool removeExternalItem( Entity::Player& player, HousingZone& terri, Land& land, - Common::InventoryType containerType, uint16_t slotId, + Common::InventoryType containerType, uint8_t slotId, bool sendToStoreroom ); /*! @@ -228,7 +227,7 @@ namespace Sapphire::World::Manager * @param rot The new rotation * @return true if moved successfully */ - bool moveExternalItem( Entity::Player& player, Common::LandIdent ident, uint16_t slot, + bool moveExternalItem( Entity::Player& player, Common::LandIdent ident, uint8_t slot, Sapphire::HousingZone& terri, Common::FFXIVARR_POSITION3 pos, float rot ); /*! @@ -245,7 +244,7 @@ namespace Sapphire::World::Manager * @return true if moved successfully */ bool moveInternalItem( Entity::Player& player, Common::LandIdent ident, - Territory::Housing::HousingInteriorTerritory& terri, uint16_t slot, + Territory::Housing::HousingInteriorTerritory& terri, uint8_t slot, Common::FFXIVARR_POSITION3 pos, float rot ); /*!