Mercurial > mm7

changeset 479:89f6107c3362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 26 Feb 2013 12:01:54 +0600
parents d4ea2d382004 (diff) 77430756f06a (current diff)
children d4ea191229ff
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;