Mercurial > mm7

comparison mm7_1.cpp @ 613:5bf285f56fa8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 07 Mar 2013 22:45:43 +0600
parents 7bae884b7cd0 628694cd5744
children 8a0ec99a5177
comparison
equal deleted inserted replaced
612:346dc5fc2969 613:5bf285f56fa8
2508 case EQUIP_RING: 2508 case EQUIP_RING:
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
2514 if ( inspect_item->uEnchantmentType )
2515 sprintf(out_text + 200, "%s: %d",pGlobalTXT_LocalizationStrings[449] , inspect_item->uEnchantmentType); //"Power"
2516 break;
2517 case EQUIP_REAGENT:
2518 sprintf(out_text + 200, "%s: %d", pGlobalTXT_LocalizationStrings[449], pItemsTable->pItems[inspect_item->uItemID].uDamageDice); //"Power"
2519 break;
2520 } 2514 }
2521 2515
2522 if ( !v77 ) 2516 if ( !v77 )
2523 { 2517 {
2524 //v23 = item_desc->uEquipType; 2518 if (item_desc->uEquipType ==EQUIP_POTION) //this is CORRECT! do not move to switch!
2525 if ( inspect_item->uEnchantmentType ) 2519 {
2520 if ( inspect_item->uEnchantmentType )
2521 sprintf(out_text + 200, "%s: %d",pGlobalTXT_LocalizationStrings[449] , inspect_item->uEnchantmentType); //"Power"
2522 }
2523 else if (item_desc->uEquipType == EQUIP_REAGENT)
2524 {
2525 sprintf(out_text + 200, "%s: %d", pGlobalTXT_LocalizationStrings[449], pItemsTable->pItems[inspect_item->uItemID].uDamageDice); //"Power"
2526 }
2527
2528 else if ( inspect_item->uEnchantmentType )
2526 { 2529 {
2527 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210], 2530 sprintf(out_text + 200, "%s: %s +%d", pGlobalTXT_LocalizationStrings[210],
2528 pItemsTable->pEnchantments[inspect_item->uEnchantmentType-1].pBonusStat, inspect_item->_bonus_strength); //"Special" 2531 pItemsTable->pEnchantments[inspect_item->uEnchantmentType-1].pBonusStat, inspect_item->_bonus_strength); //"Special"
2529 } 2532 }
2530 else if ( inspect_item->uSpecEnchantmentType ) 2533 else if ( inspect_item->uSpecEnchantmentType )
2826 }*/ 2829 }*/
2827 v106.uParentBillboardID = -1; 2830 v106.uParentBillboardID = -1;
2828 v3 = &pActors[v2]; 2831 v3 = &pActors[v2];
2829 v121 = v3; 2832 v121 = v3;
2830 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xFFu, 0x9Bu); 2833 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xFFu, 0x9Bu);
2831 v5 = v3->uNPC_ID; 2834 v5 = v3->sNPC_ID;
2832 a5 = v4; 2835 a5 = v4;
2833 v6 = GetNPCData(v5); 2836 v6 = GetNPCData(v5);
2834 v7 = v3->pMonsterInfo.uID; 2837 v7 = v3->pMonsterInfo.uID;
2835 v112 = (char **)v6; 2838 v112 = (char **)v6;
2836 v115 = byte_4E2B70[((signed __int16)v7 - 1) / 3] - 40; 2839 v115 = byte_4E2B70[((signed __int16)v7 - 1) / 3] - 40;
3041 pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY, 0); 3044 pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY, 0);
3042 v36 = v10->pHwSpriteIDs[0]; 3045 v36 = v10->pHwSpriteIDs[0];
3043 if ( v36 >= 0 ) 3046 if ( v36 >= 0 )
3044 pSprites_LOD->pSpriteHeaders[v36]._4ACC38(&v106, 0); 3047 pSprites_LOD->pSpriteHeaders[v36]._4ACC38(&v106, 0);
3045 } 3048 }
3046 if ( v121->uNPC_ID ) 3049 if ( v121->sNPC_ID )
3047 { 3050 {
3048 v37 = v112[6]; 3051 v37 = v112[6];
3049 if ( v37 ) 3052 if ( v37 )
3050 { 3053 {
3051 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]); 3054 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]);
3063 if ( v38 ) 3066 if ( v38 )
3064 v72 = pMonsterStats->pPlaceStrings[v38]; 3067 v72 = pMonsterStats->pPlaceStrings[v38];
3065 else 3068 else
3066 v72 = pMonsterStats->pInfos[v121->pMonsterInfo.uID].pName; 3069 v72 = pMonsterStats->pInfos[v121->pMonsterInfo.uID].pName;
3067 } 3070 }
3068 if(!v121->uNPC_ID || (v121->uNPC_ID && !v37)) 3071 if(!v121->sNPC_ID || (v121->sNPC_ID && !v37))
3069 strncpy(pTmpBuf, v72, v77); 3072 strncpy(pTmpBuf, v72, v77);
3070 v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 3073 v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
3071 a1->DrawTitleText(pFontComic, 0, 0xCu, v39, pTmpBuf, 3u); 3074 a1->DrawTitleText(pFontComic, 0, 0xCu, v39, pTmpBuf, 3u);
3072 Actor::DrawHealthBar(v121, a1); 3075 Actor::DrawHealthBar(v121, a1);
3073 v119 = 0; 3076 v119 = 0;
3982 if ( v2 ) 3985 if ( v2 )
3983 v3 = v2 - 1; 3986 v3 = v2 - 1;
3984 else 3987 else
3985 v3 = -1; 3988 v3 = -1;
3986 v4 = pChests[chest_id].pInventoryIndices[v3] - 1; 3989 v4 = pChests[chest_id].pInventoryIndices[v3] - 1;
3987 if ( pItemsTable->pItems[pChests[chest_id].igChestItems[v4].uItemID].uEquipType == 18 ) 3990 if ( pItemsTable->pItems[pChests[chest_id].igChestItems[v4].uItemID].uEquipType == EQUIP_GOLD )
3988 { 3991 {
3989 party_finds_gold(pItemsTable->pItems[pChests[chest_id].igChestItems[v4].uItemID].uValue, 0); //recheck 3992 party_finds_gold(pChests[chest_id].igChestItems[v4].uSpecEnchantmentType, 0);
3990 viewparams->bRedrawGameUI = 1; 3993 viewparams->bRedrawGameUI = 1;
3991 } 3994 }
3992 else 3995 else
3993 { 3996 {
3994 pParty->SetHoldingItem(&pChests[chest_id].igChestItems[v4]); 3997 pParty->SetHoldingItem(&pChests[chest_id].igChestItems[v4]);
5309 } 5312 }
5310 if ( !v17->CanAct() ) 5313 if ( !v17->CanAct() )
5311 return; 5314 return;
5312 v18 = a2.y; 5315 v18 = a2.y;
5313 Actor::FaceObject(a2.y, 4u, 0, 0); 5316 Actor::FaceObject(a2.y, 4u, 0, 0);
5314 if ( !v17->uNPC_ID ) 5317 if ( !v17->sNPC_ID )
5315 { 5318 {
5316 v19 = pNPCStats->pGroups_copy[v17->uGroup]; 5319 v19 = pNPCStats->pGroups_copy[v17->uGroup];
5317 if ( v19 ) 5320 if ( v19 )
5318 { 5321 {
5319 v20 = pNPCStats->pCatchPhrases[v19]; 5322 v20 = pNPCStats->pCatchPhrases[v19];