Mercurial > mm7

diff mm7_1.cpp @ 508:00ce82758c72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 27 Feb 2013 23:24:17 +0600
parents 542ea7a55b17 4bd56919f075
children 7c86030324a5
line wrap: on
line diff
--- a/mm7_1.cpp	Wed Feb 27 23:23:56 2013 +0600
+++ b/mm7_1.cpp	Wed Feb 27 23:24:17 2013 +0600
@@ -3618,7 +3618,7 @@
     --uRestUI_FoodRequiredToRest;
   if ( uRestUI_FoodRequiredToRest < 1 )
     uRestUI_FoodRequiredToRest = 1;
-  if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 98) )
+  if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 98) )
     uRestUI_FoodRequiredToRest = 0;
   ++pIcons_LOD->uTexturePacksCount;
   if ( !pIcons_LOD->uNumPrevLoadedFiles )
@@ -5245,9 +5245,9 @@
         sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
         ShowStatusBarString(pTmpBuf2, 2u);
         if ( v22->uItemID == 506 )
-          _449B7E_toggle_bit(pParty->_award_bits, 184, 1u);
+          _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);
         if ( v22->uItemID == 455 )
-          _449B7E_toggle_bit(pParty->_award_bits, 185, 1u);
+          _449B7E_toggle_bit(pParty->_quest_bits, 185, 1u);
         if ( !pParty->AddItem(v22) )
           pParty->SetHoldingItem(v22);
       }