mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Code Activity

fix house building, update slot struct for house exteriors

Browse source
This commit is contained in:
NotAdam 2018-12-29 16:47:26 +11:00
parent 4d9802bdbb
commit a389b39eb2
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/Common.h
View file

@ -785,10 +785,10 @@ namespace Sapphire::Common
ExteriorWall, ExteriorWall,
ExteriorWindow, ExteriorWindow,
ExteriorDoor, ExteriorDoor,
OtherFloorWall, ExteriorRoofDecoration,
OtherFloorFlooring, ExteriorWallDecoration,
BasementWall, ExteriorPlacard,
YardSign ExteriorFence
}; };
enum HousingInteriorSlot enum HousingInteriorSlot

2
src/lobby/GameConnection.cpp
View file

@ -188,7 +188,7 @@ void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet
if( i == 3 ) if( i == 3 )
{ {
charListPacket->data().entitledExpansion = 2; charListPacket->data().entitledExpansion = 2;
charListPacket->data().maxCharOnWorld = 8; charListPacket->data().maxCharOnWorld = 25;
charListPacket->data().unknown8 = 8; charListPacket->data().unknown8 = 8;
charListPacket->data().veteranRank = 12; charListPacket->data().veteranRank = 12;
charListPacket->data().counter = ( i * 4 ) + 1; charListPacket->data().counter = ( i * 4 ) + 1;

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

@ -604,7 +604,7 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
// create and link items // create and link items
for( auto& destContainer : invMap ) for( auto& destContainer : invMap )
{ {
auto container = houseInventory[ destContainer.first ]; auto& container = houseInventory[ destContainer.first ];
for( auto& item : destContainer.second ) for( auto& item : destContainer.second )
{ {
@ -904,7 +904,7 @@ void Sapphire::World::Manager::HousingMgr::updateHouseModels( Sapphire::HousePtr
} }
else else
{ {
framework()->get< Logger >()->error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for outdoor appearance." ); Logger::error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for outdoor appearance." );
} }
auto intContainer = containers.find( static_cast< uint16_t >( InventoryType::HousingInteriorAppearance ) ); auto intContainer = containers.find( static_cast< uint16_t >( InventoryType::HousingInteriorAppearance ) );
@ -918,7 +918,7 @@ void Sapphire::World::Manager::HousingMgr::updateHouseModels( Sapphire::HousePtr
} }
else else
{ {
framework()->get< Logger >()->error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for indoor appearance." ); Logger::error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for indoor appearance." );
} }
} }

2
src/world/Manager/InventoryMgr.cpp
View file

@ -134,7 +134,7 @@ void Sapphire::World::Manager::InventoryMgr::saveHousingContainerItem( uint64_t
// the second time is for the ON DUPLICATE KEY UPDATE condition // the second time is for the ON DUPLICATE KEY UPDATE condition
stmt->setUInt64( 5, itemId ); stmt->setUInt64( 5, itemId );
pDb->execute( stmt ); pDb->directExecute( stmt );
} }
void Sapphire::World::Manager::InventoryMgr::updateHousingItemPosition( Sapphire::Inventory::HousingItemPtr item ) void Sapphire::World::Manager::InventoryMgr::updateHousingItemPosition( Sapphire::Inventory::HousingItemPtr item )