1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 11:07:45 +00:00

Merge remote-tracking branch 'remotes/origin/develop' into develop_5.25

This commit is contained in:
collett 2020-05-28 16:57:16 +09:00
commit c44a469d02
2 changed files with 3 additions and 3 deletions

View file

@ -1106,7 +1106,7 @@ namespace Sapphire::Entity
uint8_t m_homePoint;
uint8_t m_startTown;
uint16_t m_townWarpFstFlags;
uint8_t m_questCompleteFlags[476];
uint8_t m_questCompleteFlags[487];
uint8_t m_discovery[445];
uint32_t m_playTime;

View file

@ -1015,7 +1015,7 @@ Sapphire::Entity::Player::sendQuestMessage( uint32_t questId, int8_t msgId, uint
void Sapphire::Entity::Player::updateQuestsCompleted( uint32_t questId )
{
uint8_t index = questId / 8;
uint16_t index = questId / 8;
uint8_t bitIndex = ( questId ) % 8;
uint8_t value = 0x80 >> bitIndex;
@ -1025,7 +1025,7 @@ void Sapphire::Entity::Player::updateQuestsCompleted( uint32_t questId )
void Sapphire::Entity::Player::removeQuestsCompleted( uint32_t questId )
{
uint8_t index = questId / 8;
uint16_t index = questId / 8;
uint8_t bitIndex = ( questId ) % 8;
uint8_t value = 0x80 >> bitIndex;