Mercurial > mm7

diff UI/UIShops.cpp @ 2092:a869b0376b48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
enums and BLV_UpdateDoors()
author Ritor1
date Thu, 12 Dec 2013 13:55:42 +0600
parents 259df09dfb50
children e1e4a8a20b5f
line wrap: on
line diff
--- a/UI/UIShops.cpp	Thu Dec 12 09:28:05 2013 +0600
+++ b/UI/UIShops.cpp	Thu Dec 12 13:55:42 2013 +0600
@@ -1355,7 +1355,7 @@
         if ( pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v117) )
         {
           item = &pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v117) - 1];
-          if ( item->uAttributes & 1 )
+          if ( item->uAttributes & ITEM_IDENTIFIED )
           {
             dialog_window.DrawTitleText(pFontArrus, 0, (212 - pFontArrus->CalcTextHeight(BuildDialogueString("%24", uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 4, 0), &dialog_window, 0, 0)) / 2 + 101,
                Color16(255, 255, 255), BuildDialogueString("%24", uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 4, 0), 3); 
@@ -1564,7 +1564,7 @@
         {
           uPriceItemService = pPlayers[uActiveCharacter]->GetPriceIdentification(p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier);
           item = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1];
-          if ( !(item->uAttributes & 1) )
+          if ( !(item->uAttributes & ITEM_IDENTIFIED) )
           {
             if ( MerchandiseTest(item, (int)window_SpeakInHouse->ptr_1C) )
             {
@@ -1572,7 +1572,7 @@
               {
                 dword_F8B1E4 = 1;
                 Party::TakeGold(uPriceItemService);
-                item->uAttributes |= 1;
+                item->uAttributes |= ITEM_IDENTIFIED;
                 pPlayers[uActiveCharacter]->PlaySound(SPEECH_73, 0);
                 ShowStatusBarString(pGlobalTXT_LocalizationStrings[569], 2);
                 return;
@@ -1604,7 +1604,7 @@
             pPriceMultiplier = p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier;
             ItemGen* _v = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1];
             uPriceItemService = pPlayers[uActiveCharacter]->GetPriceRepair(_v->GetValue(), pPriceMultiplier);
-            if ( item->uAttributes & 2 )
+            if ( item->uAttributes & ITEM_BROKEN )
             {
               if ( MerchandiseTest(item, (int)window_SpeakInHouse->ptr_1C) )
               {