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

More refactoring and linux compile fix

Browse source
This commit is contained in:
Mordred 2018-11-03 00:47:45 +01:00
parent 6347d7ed27
commit c7cb95175d
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Common.h
View file

@ -756,7 +756,6 @@ namespace Core::Common
uint32_t fcIconColor; // 16 uint32_t fcIconColor; // 16
uint16_t housePart[ 8 ]; // 34 uint16_t housePart[ 8 ]; // 34
uint8_t color[ 8 ]; // 36 uint8_t color[ 8 ]; // 36
//44
}; };
struct HousePermissionSet struct HousePermissionSet
@ -794,6 +793,7 @@ namespace Core::Common
fcHouse, fcHouse,
privateHouse privateHouse
}; };
enum HouseIconAdd : uint8_t enum HouseIconAdd : uint8_t
{ {
heart = 0x06 heart = 0x06

2
src/servers/Scripts/common/CmnDefHousingSignboard.cpp
View file

@ -14,7 +14,7 @@ public:
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1 ); player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0 );
} }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override

2
src/servers/sapphire_zone/Zone/HousingZone.cpp
View file

@ -73,7 +73,7 @@ void Core::HousingZone::onPlayerZoneIn(Entity::Player& player)
//TODO: Add Objects here //TODO: Add Objects here
player.queuePacket(landsetYardInitializePacket); player.queuePacket( landsetYardInitializePacket );
} }
} }

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

@ -44,6 +44,7 @@ Core::Land::~Land()
void Core::Land::load() void Core::Land::load()
{ {
// setPreset( 262145 );
/* auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); /* auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
auto res = pDb->query( "SELECT * FROM land WHERE Id = " + std::to_string( m_landKey ) ); auto res = pDb->query( "SELECT * FROM land WHERE Id = " + std::to_string( m_landKey ) );
if( !res->next() ) if( !res->next() )
@ -199,7 +200,7 @@ uint32_t Core::Land::getLandKey()
return m_landKey; return m_landKey;
} }
LandStruct Core::Land::getLand() const LandStruct& Core::Land::getLand()
{ {
return m_land; return m_land;
} }
@ -209,7 +210,7 @@ uint32_t Core::Land::getMaxItems()
return m_maxItems; return m_maxItems;
} }
void Core::Land::Init() void Core::Land::init()
{ {

4
src/servers/sapphire_zone/Zone/Land.h
View file

@ -50,12 +50,12 @@ namespace Core
void onUpdate(); void onUpdate();
uint32_t getLandKey(); uint32_t getLandKey();
Common::LandStruct getLand(); const Common::LandStruct& getLand();
uint32_t getMaxItems(); uint32_t getMaxItems();
private: private:
uint16_t convertItemIdToHousingItemId( uint16_t itemId ); uint16_t convertItemIdToHousingItemId( uint16_t itemId );
void Init(); void init();
uint32_t m_landKey; uint32_t m_landKey;
uint8_t m_wardNum; uint8_t m_wardNum;