From fce3397b92f1ce5acb900f0bdbdd707ff088d9ae Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Fri, 20 Jan 2023 06:51:07 +0100
Subject: [PATCH 1/2] Add missing includes for *nix

(cherry picked from commit 769edce0c883960ca9eac69a8e05e89760dafafd)
---
 src/tools/nav_export/pcb.h | 3 ++-
 src/tools/pcb_reader/pcb.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tools/nav_export/pcb.h b/src/tools/nav_export/pcb.h
index 3b7f1fdb..701042fe 100644
--- a/src/tools/nav_export/pcb.h
+++ b/src/tools/nav_export/pcb.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <vector>
+#include <cstring>
 
 struct PCB_HEADER
 {
@@ -172,4 +173,4 @@ struct PCB_LIST_FILE
   PCB_LIST_BASE_ENTRY entry;
   std::vector< PCB_LIST_ENTRY > entries;
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tools/pcb_reader/pcb.h b/src/tools/pcb_reader/pcb.h
index 647c56ca..fb8c8adf 100644
--- a/src/tools/pcb_reader/pcb.h
+++ b/src/tools/pcb_reader/pcb.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <vector>
+#include <cstring>
 
 struct PCB_HEADER
 {
@@ -173,4 +174,4 @@ struct PCB_LIST_FILE
   PCB_LIST_BASE_ENTRY entry;
   std::vector< PCB_LIST_ENTRY > entries;
 };
-#endif
\ No newline at end of file
+#endif

From 2fdbf2ef5b2d6e6779bf70a177feabedb3057ca5 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Fri, 20 Jan 2023 01:21:06 +0100
Subject: [PATCH 2/2] Fix quest bitflag mistake

(cherry picked from commit c4dcbc10f152e056a4330ec83457cebf538ae2cd)
---
 src/world/Quest/Quest.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/world/Quest/Quest.cpp b/src/world/Quest/Quest.cpp
index 3f52ef9d..bcddc5a8 100644
--- a/src/world/Quest/Quest.cpp
+++ b/src/world/Quest/Quest.cpp
@@ -25,31 +25,31 @@ bool Sapphire::World::Quest::getBitFlag8( uint8_t index )
 
 bool Sapphire::World::Quest::getBitFlag16( uint8_t index )
 {
-  uint8_t realIdx = 16 - index;
+  uint8_t realIdx = 8 - index;
   return m_data.a.BitFlag16 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag24( uint8_t index )
 {
-  uint8_t realIdx = 24 - index;
+  uint8_t realIdx = 8 - index;
   return m_data.a.BitFlag24 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag32( uint8_t index )
 {
-  uint8_t realIdx = 32 - index;
+  uint8_t realIdx = 8 - index;
   return m_data.a.BitFlag32 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag40( uint8_t index )
 {
-  uint8_t realIdx = 40 - index;
+  uint8_t realIdx = 8 - index;
   return m_data.a.BitFlag40 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag48( uint8_t index )
 {
-  uint8_t realIdx = 48 - index;
+  uint8_t realIdx = 8 - index;
   return m_data.a.BitFlag48 & ( 1 << realIdx );
 }
 
@@ -320,7 +320,7 @@ void Sapphire::World::Quest::setBitFlag8( uint8_t index, bool val )
 
 void Sapphire::World::Quest::setBitFlag16( uint8_t index, bool val )
 {
-  uint8_t realIdx = 16 - index;
+  uint8_t realIdx = 8 - index;
   if( val )
     m_data.a.BitFlag16 |= ( 1 << realIdx );
   else
@@ -329,7 +329,7 @@ void Sapphire::World::Quest::setBitFlag16( uint8_t index, bool val )
 
 void Sapphire::World::Quest::setBitFlag24( uint8_t index, bool val )
 {
-  uint8_t realIdx = 24 - index;
+  uint8_t realIdx = 8 - index;
   if( val )
     m_data.a.BitFlag24 |= ( 1 << realIdx );
   else
@@ -338,7 +338,7 @@ void Sapphire::World::Quest::setBitFlag24( uint8_t index, bool val )
 
 void Sapphire::World::Quest::setBitFlag32( uint8_t index, bool val )
 {
-  uint8_t realIdx = 32 - index;
+  uint8_t realIdx = 8 - index;
   if( val )
     m_data.a.BitFlag32 |= ( 1 << realIdx );
   else
@@ -347,7 +347,7 @@ void Sapphire::World::Quest::setBitFlag32( uint8_t index, bool val )
 
 void Sapphire::World::Quest::setBitFlag40( uint8_t index, bool val )
 {
-  uint8_t realIdx = 40 - index;
+  uint8_t realIdx = 8 - index;
   if( val )
     m_data.a.BitFlag40 |= ( 1 << realIdx );
   else
@@ -356,7 +356,7 @@ void Sapphire::World::Quest::setBitFlag40( uint8_t index, bool val )
 
 void Sapphire::World::Quest::setBitFlag48( uint8_t index, bool val )
 {
-  uint8_t realIdx = 48 - index;
+  uint8_t realIdx = 8 - index;
   if( val )
     m_data.a.BitFlag48 |= ( 1 << realIdx );
   else