mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

partially working inventory loading

Browse source
This commit is contained in:
NotAdam 2018-12-21 23:49:46 +11:00
parent 1c59eb8f98
commit 14848ee955
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Database/ZoneDbConnection.cpp
View file

@ -206,7 +206,7 @@ void Sapphire::Db::ZoneDbConnection::doPrepareStatements()
prepareStatement( LAND_INV_SEL_HOUSE, prepareStatement( LAND_INV_SEL_HOUSE,
"SELECT LandIdent, ContainerId, ItemId, SlotId FROM houseiteminventory WHERE LandIdent = ?", "SELECT LandIdent, ContainerId, ItemId, SlotId FROM houseiteminventory WHERE LandIdent = ?",
CONNECTION_BOTH ); CONNECTION_SYNC );
/*prepareStatement( LAND_INS, /*prepareStatement( LAND_INS,
"INSERT INTO land ( LandSetId ) VALUES ( ? );", "INSERT INTO land ( LandSetId ) VALUES ( ? );",

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

@ -16,6 +16,7 @@
#include "Actor/Player.h" #include "Actor/Player.h"
#include "Inventory/ItemContainer.h" #include "Inventory/ItemContainer.h"
#include "Inventory/Item.h" #include "Inventory/Item.h"
#include "Inventory/ItemUtil.h"
#include "Forwards.h" #include "Forwards.h"
#include "Land.h" #include "Land.h"
@ -72,6 +73,8 @@ void Sapphire::Land::init()
auto houseId = res->getUInt( "HouseId" ); auto houseId = res->getUInt( "HouseId" );
res.reset();
// fetch the house if we have one for this land // fetch the house if we have one for this land
if( houseId > 0 ) if( houseId > 0 )
m_pHouse = make_House( houseId, m_landSetId, getLandIdent() ); m_pHouse = make_House( houseId, m_landSetId, getLandIdent() );
@ -119,11 +122,37 @@ void Sapphire::Land::init()
// but when an inventory is requested, we will split them into groups of 50 // but when an inventory is requested, we will split them into groups of 50
setupContainer( InventoryType::HousingInteriorPlacedItems1, m_maxPlacedInternalItems ); setupContainer( InventoryType::HousingInteriorPlacedItems1, m_maxPlacedInternalItems );
setupContainer( InventoryType::HousingInteriorStoreroom1, m_maxPlacedInternalItems ); setupContainer( InventoryType::HousingInteriorStoreroom1, m_maxPlacedInternalItems );
loadItemContainerContents();
} }
void Sapphire::Land::loadItemContainerContents() void Sapphire::Land::loadItemContainerContents()
{ {
if( !m_pHouse )
return;
auto ident = *reinterpret_cast< uint64_t* >( &m_landIdent );
g_fw.get< Sapphire::Logger >()->debug( "Loading housing inventory for ident:" + std::to_string( ident ) );
auto pDB = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
// auto stmt = pDB->getPreparedStatement( Db::LAND_INV_SEL_HOUSE );
// stmt->setUInt64( 1, ident );
auto res = pDB->query( "SELECT LandIdent, ContainerId, ItemId, SlotId FROM houseiteminventory WHERE LandIdent = " + std::to_string( ident ) );
while( res->next() )
{
auto containerId = res->getUInt( "ContainerId" );
auto itemId = res->getUInt64( "ItemId" );
auto slotId = res->getUInt( "SlotId" );
auto container = m_landInventoryMap[ containerId ];
auto item = Sapphire::Items::Util::loadItem( itemId );
if( item )
container->setItem( slotId, item );
}
} }