From ca5db2cae3fa9cc74c2256e0b7f14087b30df665 Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Mon, 9 Jul 2018 21:53:23 +0100
Subject: [PATCH] changed player.setQuestBitFlag functions to allow unsetting
 the bit

---
 .../sapphire_zone/Actor/PlayerQuest.cpp       | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
index 4e7b8a9a..7c8a10f9 100644
--- a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
@@ -767,9 +767,10 @@ void Core::Entity::Player::setQuestBitFlag8( uint16_t questId, uint8_t index, bo
    {
       boost::shared_ptr< QuestActive > pNewQuest = m_activeQuests[idx];
 
-      uint8_t flag = val ? 1 : 0;
-
-      pNewQuest->a.BitFlag8 |= ( val << index );
+      if( val )
+         pNewQuest->a.BitFlag8 |= ( 1 << index );
+      else
+         pNewQuest->a.BitFlag8 &= ~( 1 << index );
 
       updateQuest( questId, pNewQuest->c.sequence );
    }
@@ -783,9 +784,10 @@ void Core::Entity::Player::setQuestBitFlag16( uint16_t questId, uint8_t index, b
    {
       boost::shared_ptr< QuestActive > pNewQuest = m_activeQuests[idx];
 
-      uint8_t flag = val ? 1 : 0;
-
-      pNewQuest->a.BitFlag16 |= ( val << index );
+      if( val )
+         pNewQuest->a.BitFlag16 |= ( 1 << index );
+      else
+         pNewQuest->a.BitFlag16 &= ~( 1 << index );
 
       updateQuest( questId, pNewQuest->c.sequence );
    }
@@ -799,13 +801,15 @@ void Core::Entity::Player::setQuestBitFlag24( uint16_t questId, uint8_t index, b
    {
       boost::shared_ptr< QuestActive > pNewQuest = m_activeQuests[idx];
 
-      uint8_t flag = val ? 1 : 0;
-
-      pNewQuest->a.BitFlag24 |= ( val << index );
+      if( val )
+         pNewQuest->a.BitFlag24 |= ( 1 << index );
+      else
+         pNewQuest->a.BitFlag24 &= ~( 1 << index );
 
       updateQuest( questId, pNewQuest->c.sequence );
    }
 }
+
 void Core::Entity::Player::setQuestBitFlag32( uint16_t questId, uint8_t index, bool val )
 {
    int8_t idx = getQuestIndex( questId );
@@ -814,9 +818,10 @@ void Core::Entity::Player::setQuestBitFlag32( uint16_t questId, uint8_t index, b
    {
       boost::shared_ptr< QuestActive > pNewQuest = m_activeQuests[idx];
 
-      uint8_t flag = val ? 1 : 0;
-
-      pNewQuest->a.BitFlag32 |= ( val << index );
+      if( val )
+         pNewQuest->a.BitFlag32 |= ( 1 << index );
+      else
+         pNewQuest->a.BitFlag32 &= ~( 1 << index );
 
       updateQuest( questId, pNewQuest->c.sequence );
    }
@@ -830,9 +835,10 @@ void Core::Entity::Player::setQuestBitFlag40( uint16_t questId, uint8_t index, b
    {
       boost::shared_ptr< QuestActive > pNewQuest = m_activeQuests[idx];
 
-      uint8_t flag = val ? 1 : 0;
-
-      pNewQuest->a.BitFlag40 |= ( val << index );
+      if( val )
+         pNewQuest->a.BitFlag40 |= ( 1 << index );
+      else
+         pNewQuest->a.BitFlag40 &= ~( 1 << index );
 
       updateQuest( questId, pNewQuest->c.sequence );
    }
@@ -846,16 +852,16 @@ void Core::Entity::Player::setQuestBitFlag48( uint16_t questId, uint8_t index, b
    {
       boost::shared_ptr< QuestActive > pNewQuest = m_activeQuests[idx];
 
-      uint8_t flag = val ? 1 : 0;
-
-      pNewQuest->a.BitFlag48 |= ( val << index );
+      if( val )
+         pNewQuest->a.BitFlag48 |= ( 1 << index );
+      else
+         pNewQuest->a.BitFlag48 &= ~( 1 << index );
 
       updateQuest( questId, pNewQuest->c.sequence );
    }
 }
 
 
-
 uint8_t Core::Entity::Player::getQuestSeq( uint16_t questId )
 {
    int8_t idx = getQuestIndex( questId );
@@ -1027,7 +1033,7 @@ bool Core::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optional
    auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    uint32_t playerLevel = getLevel();
    auto questInfo = pExdData->get< Core::Data::Quest >( questId );
-   
+
 
    if( !questInfo )
       return false;
@@ -1062,7 +1068,7 @@ bool Core::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optional
       auto itemId = questInfo->itemReward1.at( optionalChoice );
       addItem( -1, itemId, questInfo->itemCountReward1.at( optionalChoice ) );
    }
-   
+
    if( gilReward > 0 )
       addCurrency( 1, gilReward );