Mercurial > mm7
comparison UI/UIPopup.cpp @ 1627:361b63797bdf
Слияние
author | Ritor1 |
---|---|
date | Fri, 13 Sep 2013 10:10:53 +0600 |
parents | 96a1f5e0b6cd |
children | 6faacde46271 |
comparison
equal
deleted
inserted
replaced
1626:fe2be40018a5 | 1627:361b63797bdf |
---|---|
437 } | 437 } |
438 | 438 |
439 else if ( inspect_item->uEnchantmentType ) | 439 else if ( inspect_item->uEnchantmentType ) |
440 { | 440 { |
441 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210], | 441 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210], |
442 pItemsTable->pEnchantments[inspect_item->uEnchantmentType-1].pBonusStat, inspect_item->_bonus_strength); //"Special" | 442 pItemsTable->pEnchantments[inspect_item->uEnchantmentType-1].pBonusStat, inspect_item->m_enchantmentStrength); //"Special" |
443 } | 443 } |
444 else if ( inspect_item->uSpecEnchantmentType ) | 444 else if ( inspect_item->uSpecEnchantmentType ) |
445 { | 445 { |
446 sprintf(out_text + 200, "%s: %s", pGlobalTXT_LocalizationStrings[210], | 446 sprintf(out_text + 200, "%s: %s", pGlobalTXT_LocalizationStrings[210], |
447 pItemsTable->pSpecialEnchantments[inspect_item->uSpecEnchantmentType-1].pBonusStatement, inspect_item->_bonus_strength); | 447 pItemsTable->pSpecialEnchantments[inspect_item->uSpecEnchantmentType-1].pBonusStatement, inspect_item->m_enchantmentStrength); |
448 } | 448 } |
449 | 449 |
450 else if ( inspect_item->uNumCharges ) | 450 else if ( inspect_item->uNumCharges ) |
451 { | 451 { |
452 sprintf(out_text + 200, "%s: %lu", pGlobalTXT_LocalizationStrings[464], inspect_item->uNumCharges); //"Charges" | 452 sprintf(out_text + 200, "%s: %lu", pGlobalTXT_LocalizationStrings[464], inspect_item->uNumCharges); //"Charges" |