From acf61a47943ecb175da89985a97d7cd31f73fa0f Mon Sep 17 00:00:00 2001 From: Lucy <44952533+Skyliegirl33@users.noreply.github.com> Date: Fri, 20 Jan 2023 06:50:39 +0100 Subject: [PATCH 1/2] Fix QuestData struct (cherry picked from commit be59f1f7ce698dfd8fb0f0945b424c45aa14e0d2) --- src/common/Common.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/Common.h b/src/common/Common.h index c9561a00..0e2e9aa9 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -723,6 +723,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; + uint8_t padding1; uint8_t vars[6]; } packed; @@ -731,6 +732,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; + uint8_t padding1; uint8_t BitFlag48; uint8_t BitFlag40; uint8_t BitFlag32; @@ -744,6 +746,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; + uint8_t padding1; uint8_t UI8AL : 4; uint8_t UI8AH : 4; uint8_t UI8BL : 4; @@ -763,6 +766,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; + uint8_t padding1; uint8_t UI8A; uint8_t UI8B; uint8_t UI8C; From d24b7111638eafe7a26a0f76de646a0008e4c3f2 Mon Sep 17 00:00:00 2001 From: Lucy <44952533+Skyliegirl33@users.noreply.github.com> Date: Fri, 20 Jan 2023 07:29:37 +0100 Subject: [PATCH 2/2] Rename QuestData field to be more accurate --- src/common/Common.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 0e2e9aa9..f672e8ae 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -723,7 +723,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; - uint8_t padding1; + uint8_t unknown1; uint8_t vars[6]; } packed; @@ -732,7 +732,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; - uint8_t padding1; + uint8_t unknown1; uint8_t BitFlag48; uint8_t BitFlag40; uint8_t BitFlag32; @@ -746,7 +746,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; - uint8_t padding1; + uint8_t unknown1; uint8_t UI8AL : 4; uint8_t UI8AH : 4; uint8_t UI8BL : 4; @@ -766,7 +766,7 @@ namespace Sapphire::Common uint16_t questId; uint8_t sequence; uint8_t flags; - uint8_t padding1; + uint8_t unknown1; uint8_t UI8A; uint8_t UI8B; uint8_t UI8C;