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

fix LandFlagsSlot

Browse source 
What was previously listed as "apartment" should be the private chambers in a FC house, and the unknown value should be apartments
This commit is contained in:
Moydow 2023-03-04 00:09:44 +00:00
parent fe10e55118
commit 9cc0b01b3b
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/Common.h
View file

@ -993,9 +993,10 @@ namespace Sapphire::Common
{ {
FreeCompany, FreeCompany,
Private, Private,
Apartment, FreeCompanyChambers,
SharedHouse1, SharedHouse1,
SharedHouse2 SharedHouse2,
Apartment
}; };
enum class LandType : uint8_t enum class LandType : uint8_t

4
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1868,11 +1868,11 @@ namespace Sapphire::Network::Packets::Server
uint64_t unknown1; uint64_t unknown1;
Common::LandFlagSet privateHouse; // 24 Common::LandFlagSet privateHouse; // 24
uint64_t unknown2; uint64_t unknown2;
Common::LandFlagSet apartment; // 48 Common::LandFlagSet freeCompanyChambers; // 48
uint64_t unknown3; uint64_t unknown3;
Common::LandFlagSet sharedHouse[2]; //72 Common::LandFlagSet sharedHouse[2]; //72
uint64_t unknown4; uint64_t unknown4;
Common::LandFlagSet unknownHouse; Common::LandFlagSet apartment;
uint64_t unknown5; uint64_t unknown5;
}; };

5
src/world/Actor/Player.cpp
View file

@ -102,7 +102,7 @@ Sapphire::Entity::Player::Player() :
memset( m_classArray, 0, sizeof( m_classArray ) ); memset( m_classArray, 0, sizeof( m_classArray ) );
memset( m_expArray, 0, sizeof( m_expArray ) ); memset( m_expArray, 0, sizeof( m_expArray ) );
for ( uint8_t i = 0; i < 5; i++ ) for ( uint8_t i = 0; i < 6; i++ )
{ {
memset( &m_landFlags[i], 0xFF, 8 ); memset( &m_landFlags[i], 0xFF, 8 );
memset( &m_landFlags[i].landFlags, 0, 8 ); memset( &m_landFlags[i].landFlags, 0, 8 );
@ -2126,9 +2126,10 @@ void Sapphire::Entity::Player::sendLandFlags()
landFlags->data().freeCompanyHouse = m_landFlags[ Common::LandFlagsSlot::FreeCompany ]; landFlags->data().freeCompanyHouse = m_landFlags[ Common::LandFlagsSlot::FreeCompany ];
landFlags->data().privateHouse = m_landFlags[ Common::LandFlagsSlot::Private ]; landFlags->data().privateHouse = m_landFlags[ Common::LandFlagsSlot::Private ];
landFlags->data().apartment = m_landFlags[ Common::LandFlagsSlot::Apartment ]; landFlags->data().freeCompanyChambers = m_landFlags[ Common::LandFlagsSlot::FreeCompanyChambers ];
landFlags->data().sharedHouse[ 0 ] = m_landFlags[ Common::LandFlagsSlot::SharedHouse1 ]; landFlags->data().sharedHouse[ 0 ] = m_landFlags[ Common::LandFlagsSlot::SharedHouse1 ];
landFlags->data().sharedHouse[ 1 ] = m_landFlags[ Common::LandFlagsSlot::SharedHouse2 ]; landFlags->data().sharedHouse[ 1 ] = m_landFlags[ Common::LandFlagsSlot::SharedHouse2 ];
landFlags->data().apartment = m_landFlags[ Common::LandFlagsSlot::Apartment ];
queuePacket( landFlags ); queuePacket( landFlags );
} }

2
src/world/Actor/Player.h
View file

@ -1153,7 +1153,7 @@ namespace Sapphire::Entity
uint8_t m_searchSelectClass; // class selected to show up in profile uint8_t m_searchSelectClass; // class selected to show up in profile
// housing info // housing info
Common::LandFlagSet m_landFlags[5]; Common::LandFlagSet m_landFlags[6];
Common::ActiveLand m_activeLand; Common::ActiveLand m_activeLand;