Mercurial > mm7
diff UI/UIPopup.cpp @ 2092:a869b0376b48
enums and BLV_UpdateDoors()
author | Ritor1 |
---|---|
date | Thu, 12 Dec 2013 13:55:42 +0600 |
parents | 259df09dfb50 |
children | 52415f8bf7c2 |
line wrap: on
line diff
--- a/UI/UIPopup.cpp Thu Dec 12 09:28:05 2013 +0600 +++ b/UI/UIPopup.cpp Thu Dec 12 13:55:42 2013 +0600 @@ -314,7 +314,7 @@ TEXTURE_16BIT_PALETTE)->uTextureHeight + v81 + 54; if ( (signed int)Str > (signed int)iteminfo_window.uFrameHeight ) iteminfo_window.uFrameHeight = (unsigned int)Str; - if ( inspect_item->uAttributes & 8 && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) ) + if ( inspect_item->uAttributes & ITEM_TEMP_BONUS && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) ) iteminfo_window.uFrameHeight += LOBYTE(pFontComic->uFontHeight); v85 = 0; if ( pFontArrus->uFontHeight ) @@ -366,7 +366,7 @@ } else { - if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) ) + if ( (inspect_item->uAttributes & ITEM_TEMP_BONUS) && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) ) { init_summoned_item(&v67, inspect_item->uExpireTime - pParty->uTimePlayed); strcpy(pTmpBuf.data(), "Duration:"); @@ -393,11 +393,11 @@ } sprintf(pTmpBuf.data(), "%s: %lu", pGlobalTXT_LocalizationStrings[465], inspect_item->GetValue()); iteminfo_window.DrawText(pFontComic, 100, iteminfo_window.uFrameHeight - LOBYTE(pFontComic->uFontHeight), 0, pTmpBuf.data(), 0, 0, 0); - if ( BYTE1(inspect_item->uAttributes) & 1 ) + if ( inspect_item->uAttributes & ITEM_STOLEN ) pText = pGlobalTXT_LocalizationStrings[187]; //"Stolen" else { - if ( !(BYTE1(inspect_item->uAttributes) & 2) ) + if ( !(inspect_item->uAttributes & ITEM_HARDENED) ) { pRenderer->ResetTextureClipRect(); if ( !areWeLoadingTexture )