Mercurial > mm7

comparison mm7_1.cpp @ 595:55d6b756e03a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cave textures
author Nomad
date Wed, 06 Mar 2013 16:51:23 +0200
parents 829fb49eee05
children db4a23580e6c 7bae884b7cd0
comparison
equal deleted inserted replaced
594:badd65dff4e7 595:55d6b756e03a
2509 case EQUIP_AMULET: 2509 case EQUIP_AMULET:
2510 if (item_desc->uDamageDice) //"Armor" 2510 if (item_desc->uDamageDice) //"Armor"
2511 sprintfex(out_text + 100, "%s: +%d", pGlobalTXT_LocalizationStrings[11], item_desc->uDamageDice + item_desc->uDamageMod); 2511 sprintfex(out_text + 100, "%s: +%d", pGlobalTXT_LocalizationStrings[11], item_desc->uDamageDice + item_desc->uDamageMod);
2512 break; 2512 break;
2513 case EQUIP_POTION: 2513 case EQUIP_POTION:
2514 if ( inspect_item->uEncantmentType ) 2514 if ( inspect_item->uEnchantmentType )
2515 sprintf(out_text + 200, "%s: %d",pGlobalTXT_LocalizationStrings[449] , inspect_item->uEncantmentType); //"Power" 2515 sprintf(out_text + 200, "%s: %d",pGlobalTXT_LocalizationStrings[449] , inspect_item->uEnchantmentType); //"Power"
2516 break; 2516 break;
2517 case EQUIP_REAGENT: 2517 case EQUIP_REAGENT:
2518 sprintf(out_text + 200, "%s: %d", pGlobalTXT_LocalizationStrings[449], pItemsTable->pItems[inspect_item->uItemID].uDamageDice); //"Power" 2518 sprintf(out_text + 200, "%s: %d", pGlobalTXT_LocalizationStrings[449], pItemsTable->pItems[inspect_item->uItemID].uDamageDice); //"Power"
2519 break; 2519 break;
2520 } 2520 }
2521 2521
2522 if ( !v77 ) 2522 if ( !v77 )
2523 { 2523 {
2524 //v23 = item_desc->uEquipType; 2524 //v23 = item_desc->uEquipType;
2525 if ( inspect_item->uEncantmentType ) 2525 if ( inspect_item->uEnchantmentType )
2526 { 2526 {
2527 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210], 2527 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210],
2528 pItemsTable->pEnchantments[inspect_item->uEncantmentType-1].pBonusStat, inspect_item->_bonus_strength); //"Special" 2528 pItemsTable->pEnchantments[inspect_item->uEnchantmentType-1].pBonusStat, inspect_item->_bonus_strength); //"Special"
2529 } 2529 }
2530 else if ( inspect_item->uSpecEnchantmentType ) 2530 else if ( inspect_item->uSpecEnchantmentType )
2531 { 2531 {
2532 sprintf(out_text + 200, "%s: %s", pGlobalTXT_LocalizationStrings[210], 2532 sprintf(out_text + 200, "%s: %s", pGlobalTXT_LocalizationStrings[210],
2533 pItemsTable->pSpecialEnchantments[inspect_item->uSpecEnchantmentType-1].pBonusStatement, inspect_item->_bonus_strength); 2533 pItemsTable->pSpecialEnchantments[inspect_item->uSpecEnchantmentType-1].pBonusStatement, inspect_item->_bonus_strength);
2563 Str += v29; 2563 Str += v29;
2564 } 2564 }
2565 wHintWindow.uFrameHeight = v73->uTextureHeight + v81 + 54; 2565 wHintWindow.uFrameHeight = v73->uTextureHeight + v81 + 54;
2566 if ( (signed int)Str > (signed int)wHintWindow.uFrameHeight ) 2566 if ( (signed int)Str > (signed int)wHintWindow.uFrameHeight )
2567 wHintWindow.uFrameHeight = (unsigned int)Str; 2567 wHintWindow.uFrameHeight = (unsigned int)Str;
2568 if ( inspect_item->uAttributes & 8 && (inspect_item->uSpecEnchantmentType || inspect_item->uEncantmentType) ) 2568 if ( inspect_item->uAttributes & 8 && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) )
2569 wHintWindow.uFrameHeight += LOBYTE(pFontComic->uFontHeight); 2569 wHintWindow.uFrameHeight += LOBYTE(pFontComic->uFontHeight);
2570 v85 = 0; 2570 v85 = 0;
2571 if ( pFontArrus->uFontHeight ) 2571 if ( pFontArrus->uFontHeight )
2572 { 2572 {
2573 wHintWindow.uFrameWidth -= 24; 2573 wHintWindow.uFrameWidth -= 24;
2631 v42 = wHintWindow.uFrameHeight - LOBYTE(pFontComic->uFontHeight); 2631 v42 = wHintWindow.uFrameHeight - LOBYTE(pFontComic->uFontHeight);
2632 v41 = 100; 2632 v41 = 100;
2633 } 2633 }
2634 else 2634 else
2635 { 2635 {
2636 if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEncantmentType) ) 2636 if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) )
2637 { 2637 {
2638 sub_493F79(&v67, inspect_item->uExpireTime - pParty->uTimePlayed); 2638 sub_493F79(&v67, inspect_item->uExpireTime - pParty->uTimePlayed);
2639 strcpy(pTmpBuf, "Duration:"); 2639 strcpy(pTmpBuf, "Duration:");
2640 Str = (char *)(v67.field_18_expire_year - game_starting_year); 2640 Str = (char *)(v67.field_18_expire_year - game_starting_year);
2641 if (v67.field_18_expire_year != 1168 ) 2641 if (v67.field_18_expire_year != 1168 )
4892 4892
4893 if (!player->CanAct()) 4893 if (!player->CanAct())
4894 { 4894 {
4895 player = pPlayers[uActiveCharacter]; 4895 player = pPlayers[uActiveCharacter];
4896 } 4896 }
4897 if(playerCanAct() || !pPlayers[uActiveCharacter]->CanAct()) 4897 if(player->CanAct() || !pPlayers[uActiveCharacter]->CanAct())
4898 player->PlaySound(SPEECH_NoRoom, 0); 4898 player->PlaySound(SPEECH_NoRoom, 0);
4899 } 4899 }
4900 4900
4901 //LABEL_9: 4901 //LABEL_9:
4902 if (pCurrentScreen == SCREEN_GAME) 4902 if (pCurrentScreen == SCREEN_GAME)