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

Small refactors

Browse source
This commit is contained in:
Mordred 2018-11-03 23:44:43 +01:00
parent 12cb928f33
commit a0616c8d7c
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/Common.h
View file

@ -777,15 +777,14 @@ namespace Core::Common
uint16_t pos_z;
};
enum HouseSizeType : uint8_t
enum HouseSize : uint8_t
{
//noneHouse,
smallHouse,
mediumHouse,
bigHouse
small,
medium,
big
};
enum HouseStateType : uint8_t
enum HouseState : uint8_t
{
none,
forSale,

12
src/servers/sapphire_zone/Zone/Land.cpp
View file

@ -45,7 +45,7 @@ Core::Land::~Land()
void Core::Land::load()
{
m_land.houseSize = 1;
m_land.houseState = 1;
m_land.houseState = HouseState::forSale;
// setPreset( 262145 );
/* auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
auto res = pDb->query( "SELECT * FROM land WHERE Id = " + std::to_string( m_landKey ) );
@ -218,15 +218,15 @@ void Core::Land::init()
switch( getHouseSize() )
{
case HouseSizeType::smallHouse:
case HouseSize::small:
m_initPrice = 3750000;
m_maxItems = 20;
break;
case HouseSizeType::mediumHouse:
case HouseSize::medium:
m_initPrice = 20000000;
m_maxItems = 30;
break;
case HouseSizeType::bigHouse:
case HouseSize::big:
m_initPrice = 50000000;
m_maxItems = 40;
break;
@ -248,13 +248,13 @@ void Core::Land::UpdateDatabase()
void Core::Land::Update( uint32_t currTime )
{
if( m_currentPrice == 0 && getState() == HouseStateType::forSale )
if( m_currentPrice == 0 && getState() == HouseState::forSale )
{
m_currentPrice = m_initPrice;
m_nextDrop = 0;
UpdateDatabase();
}
if( m_nextDrop < currTime && getState() == HouseStateType::forSale )
if( m_nextDrop < currTime && getState() == HouseState::forSale )
{
m_currentPrice = ( m_currentPrice / 100 ) * 90;
m_nextDrop = currTime + 86400;