# HG changeset patch
# User Ritor1
# Date 1361858514 -21600
# Node ID 89f6107c3362ad0393c18b4a87f52a77b29bd273
# Parent  d4ea2d382004c6e59c52d2ac567524916f8bc052# Parent  77430756f06aef455254f0178cbe6aeb4391cfe1
Слияние

diff -r 77430756f06a -r 89f6107c3362 Events.cpp
--- a/Events.cpp	Tue Feb 26 08:47:23 2013 +0400
+++ b/Events.cpp	Tue Feb 26 12:01:54 2013 +0600
@@ -837,7 +837,7 @@
 							{
 							++curr_seq_num;
 							v4 = v124;
-							
+
 							//v6 = v123;
 							//v7 = "";
 							break;
diff -r 77430756f06a -r 89f6107c3362 Player.cpp
--- a/Player.cpp	Tue Feb 26 08:47:23 2013 +0400
+++ b/Player.cpp	Tue Feb 26 12:01:54 2013 +0600
@@ -7984,9 +7984,9 @@
         case VAR_QBits_QuestsDone:
           v13 = 0x80u >> (pValue - 1) % 8;
           v14 = pParty->_award_bits[(pValue - 1) >> 3];
-          if ( !((unsigned __int8)v13 & v14) )
-            return false;
-          return true;
+          if ( v13 & v14 )
+            return true;
+          return false;
         case VAR_PlayerItemInHands:
           v15 = 0;
           v16 = v3->pInventoryItems;