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

store aetheryte status in house object

Browse source
This commit is contained in:
NotAdam 2018-12-29 19:38:29 +11:00
parent d4f431b37a
commit b5b49f4d8c
6 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,6 +193,7 @@ void Sapphire::World::Manager::HousingMgr::initLandCache()
entry.m_estateName = res->getString( "HouseName" ); entry.m_estateName = res->getString( "HouseName" );
entry.m_buildTime = res->getUInt64( "BuildTime" ); entry.m_buildTime = res->getUInt64( "BuildTime" );
entry.m_endorsements = res->getUInt64( "Endorsements" ); entry.m_endorsements = res->getUInt64( "Endorsements" );
entry.m_hasAetheryte = res->getBoolean( "Aetheryte" );
m_landCache[ entry.m_landSetId ].push_back( entry ); m_landCache[ entry.m_landSetId ].push_back( entry );

2
src/world/Manager/HousingMgr.h
View file

@ -46,6 +46,8 @@ namespace Sapphire::World::Manager
std::string m_estateComment; std::string m_estateComment;
std::string m_estateName; std::string m_estateName;
bool m_hasAetheryte;
uint64_t m_buildTime; uint64_t m_buildTime;
uint64_t m_endorsements; uint64_t m_endorsements;

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

@ -32,7 +32,7 @@ void Sapphire::House::updateHouseDb()
stmt->setUInt( 6, m_houseId ); stmt->setUInt( 6, m_houseId );
stmt->setInt64( 1, m_buildTime ); stmt->setInt64( 1, m_buildTime );
stmt->setInt( 2, 0 ); stmt->setBool( 2, m_hasAetheryte );
stmt->setString( 3, m_estateComment ); stmt->setString( 3, m_estateComment );
stmt->setString( 4, m_estateName ); stmt->setString( 4, m_estateName );
@ -105,3 +105,13 @@ uint32_t Sapphire::House::getInteriorModel( Sapphire::Common::HousingInteriorSlo
{ {
return m_interiorModelCache[ slot ]; return m_interiorModelCache[ slot ];
} }
bool Sapphire::House::getHasAetheryte() const
{
return m_hasAetheryte;
}
void Sapphire::House::setHasAetheryte( bool hasAetheryte )
{
m_hasAetheryte = hasAetheryte;
}

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

@ -41,12 +41,16 @@ namespace Sapphire
void updateHouseDb(); void updateHouseDb();
void setHasAetheryte( bool hasAetheryte );
bool getHasAetheryte() const;
private: private:
uint32_t m_landSetId; uint32_t m_landSetId;
Common::LandIdent m_landIdent; Common::LandIdent m_landIdent;
uint32_t m_houseId; uint32_t m_houseId;
uint64_t m_buildTime; uint64_t m_buildTime;
bool m_hasAetheryte;
HouseModelsArray m_exteriorModelCache; HouseModelsArray m_exteriorModelCache;
uint32_t m_interiorModelCache[10]; uint32_t m_interiorModelCache[10];

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

@ -73,13 +73,6 @@ void Sapphire::Land::init( Common::LandType type, uint8_t size, uint8_t state, u
} }
} }
uint32_t Sapphire::Land::convertItemIdToHousingItemId( uint32_t itemId )
{
auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
auto info = pExdData->get< Sapphire::Data::Item >( itemId );
return info->additionalData;
}
uint32_t Sapphire::Land::getCurrentPrice() const uint32_t Sapphire::Land::getCurrentPrice() const
{ {
return m_currentPrice; return m_currentPrice;

1
src/world/Territory/Land.h
View file

@ -66,7 +66,6 @@ namespace Sapphire
InvMaxItemsPair getInventoryItemMax() const; InvMaxItemsPair getInventoryItemMax() const;
private: private:
uint32_t convertItemIdToHousingItemId( uint32_t itemId );
uint32_t getNextHouseId(); uint32_t getNextHouseId();
Common::LandIdent m_landIdent; Common::LandIdent m_landIdent;