Mercurial > mm7

comparison mm7_1.cpp @ 570:f54481c85df8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
itemgen working, i hope
author Gloval
date Wed, 06 Mar 2013 00:09:49 +0400
parents f451efdb7c8b
children a436924b31c3
comparison
equal deleted inserted replaced
569:f451efdb7c8b 570:f54481c85df8
2477 case EQUIP_RING: 2477 case EQUIP_RING:
2478 case EQUIP_AMULET: 2478 case EQUIP_AMULET:
2479 if (item_desc->uDamageDice) //"Armor" 2479 if (item_desc->uDamageDice) //"Armor"
2480 sprintfex(out_text + 100, "%s: +%d", pGlobalTXT_LocalizationStrings[11], item_desc->uDamageDice + item_desc->uDamageMod); 2480 sprintfex(out_text + 100, "%s: +%d", pGlobalTXT_LocalizationStrings[11], item_desc->uDamageDice + item_desc->uDamageMod);
2481 break; 2481 break;
2482 case EQUIP_POTION: 2482
2483 if ( inspect_item->uEncantmentType )
2484 sprintf(out_text + 200, "%s: %d",pGlobalTXT_LocalizationStrings[449] , inspect_item->uEncantmentType); //"Power"
2485 break;
2486 case EQUIP_REAGENT:
2487 sprintf(out_text + 200, "%s: %d", pGlobalTXT_LocalizationStrings[449], pItemsTable->pItems[inspect_item->uItemID].uDamageDice); //"Power"
2488 break;
2489 } 2483 }
2490 2484
2491 if ( v77 ) 2485 if ( v77 )
2492 goto LABEL_65; 2486 goto LABEL_65;
2493 //v23 = item_desc->uEquipType; 2487 if (item_desc->uEquipType==EQUIP_POTION)
2494 2488 {
2495 2489 if ( inspect_item->uEnchantmentType )
2496 if ( inspect_item->uEncantmentType ) 2490 sprintf(out_text + 200, "%s: %d",pGlobalTXT_LocalizationStrings[449] , inspect_item->uEnchantmentType); //"Power"
2491 }
2492 else if (item_desc->uEquipType== EQUIP_REAGENT)
2493 {sprintf(out_text + 200, "%s: %d", pGlobalTXT_LocalizationStrings[449], pItemsTable->pItems[inspect_item->uItemID].uDamageDice); //"Power"
2494 }
2495 else if ( inspect_item->uEnchantmentType )
2497 { 2496 {
2498 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210], 2497 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210],
2499 pItemsTable->pEnchantments[inspect_item->uEncantmentType-1].pBonusStat, inspect_item->_bonus_strength); //"Special" 2498 pItemsTable->pEnchantments[inspect_item->uEnchantmentType-1].pBonusStat, inspect_item->_bonus_strength); //"Special"
2500 } 2499 }
2501 else if ( inspect_item->uSpecEnchantmentType ) 2500 else if ( inspect_item->uSpecEnchantmentType )
2502 { 2501 {
2503 sprintf(out_text + 200, "%s: %s", pGlobalTXT_LocalizationStrings[210], 2502 sprintf(out_text + 200, "%s: %s", pGlobalTXT_LocalizationStrings[210],
2504 pItemsTable->pSpecialEnchantments[inspect_item->uSpecEnchantmentType-1].pBonusStatement, inspect_item->_bonus_strength); 2503 pItemsTable->pSpecialEnchantments[inspect_item->uSpecEnchantmentType-1].pBonusStatement, inspect_item->_bonus_strength);
2535 Str += v29; 2534 Str += v29;
2536 } 2535 }
2537 wHintWindow.uFrameHeight = v73->uTextureHeight + v81 + 54; 2536 wHintWindow.uFrameHeight = v73->uTextureHeight + v81 + 54;
2538 if ( (signed int)Str > (signed int)wHintWindow.uFrameHeight ) 2537 if ( (signed int)Str > (signed int)wHintWindow.uFrameHeight )
2539 wHintWindow.uFrameHeight = (unsigned int)Str; 2538 wHintWindow.uFrameHeight = (unsigned int)Str;
2540 if ( inspect_item->uAttributes & 8 && (inspect_item->uSpecEnchantmentType || inspect_item->uEncantmentType) ) 2539 if ( inspect_item->uAttributes & 8 && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) )
2541 wHintWindow.uFrameHeight += LOBYTE(pFontComic->uFontHeight); 2540 wHintWindow.uFrameHeight += LOBYTE(pFontComic->uFontHeight);
2542 v85 = 0; 2541 v85 = 0;
2543 if ( pFontArrus->uFontHeight ) 2542 if ( pFontArrus->uFontHeight )
2544 { 2543 {
2545 wHintWindow.uFrameWidth -= 24; 2544 wHintWindow.uFrameWidth -= 24;
2603 v42 = wHintWindow.uFrameHeight - LOBYTE(pFontComic->uFontHeight); 2602 v42 = wHintWindow.uFrameHeight - LOBYTE(pFontComic->uFontHeight);
2604 v41 = 100; 2603 v41 = 100;
2605 } 2604 }
2606 else 2605 else
2607 { 2606 {
2608 if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEncantmentType) ) 2607 if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) )
2609 { 2608 {
2610 sub_493F79(&v67, inspect_item->uExpireTime - pParty->uTimePlayed); 2609 sub_493F79(&v67, inspect_item->uExpireTime - pParty->uTimePlayed);
2611 strcpy(pTmpBuf, "Duration:"); 2610 strcpy(pTmpBuf, "Duration:");
2612 Str = (char *)(v67.field_18_expire_year - game_starting_year); 2611 Str = (char *)(v67.field_18_expire_year - game_starting_year);
2613 if (v67.field_18_expire_year != 1168 ) 2612 if (v67.field_18_expire_year != 1168 )