Mercurial > mm7

comparison mm7_5.cpp @ 574:f90753ebabe3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Wed, 06 Mar 2013 06:41:36 +0200
parents 7c0763248a87 f54481c85df8
children c697d17c5179 96f48cfdd657
comparison
equal deleted inserted replaced
573:7c0763248a87 574:f90753ebabe3
15428 && pParty->pPickedItem.uItemID != 233 ) 15428 && pParty->pPickedItem.uItemID != 233 )
15429 goto LABEL_116; 15429 goto LABEL_116;
15430 v27 = &v0->pInventoryItems[pOut.z]; 15430 v27 = &v0->pInventoryItems[pOut.z];
15431 v28 = v27->uItemID; 15431 v28 = v27->uItemID;
15432 v51 = pItemsTable->pItems[v27->uItemID].uEquipType; 15432 v51 = pItemsTable->pItems[v27->uItemID].uEquipType;
15433 v29 = (ItemGen *)(1800 * pParty->pPickedItem.uEncantmentType); 15433 v29 = (ItemGen *)(1800 * pParty->pPickedItem.uEnchantmentType);
15434 if ( pParty->pPickedItem.uItemID != 233 ) 15434 if ( pParty->pPickedItem.uItemID != 233 )
15435 { 15435 {
15436 if ( pParty->pPickedItem.uItemID == 236 ) 15436 if ( pParty->pPickedItem.uItemID == 236 )
15437 { 15437 {
15438 v35 = v27->uAttributes; 15438 v35 = v27->uAttributes;
15450 v27->UpdateTempBonus(pParty->uTimePlayed); 15450 v27->UpdateTempBonus(pParty->uTimePlayed);
15451 v33 = v27->uItemID; 15451 v33 = v27->uItemID;
15452 if ( (signed int)v27->uItemID >= 64 && (signed int)v33 <= 65 15452 if ( (signed int)v27->uItemID >= 64 && (signed int)v33 <= 65
15453 || (pOut.y = v27->uAttributes, pOut.y & 2) 15453 || (pOut.y = v27->uAttributes, pOut.y & 2)
15454 || v27->uSpecEnchantmentType 15454 || v27->uSpecEnchantmentType
15455 || v27->uEncantmentType 15455 || v27->uEnchantmentType
15456 || v51 && v51 != 1 && v51 != 2 15456 || v51 && v51 != 1 && v51 != 2
15457 || (signed int)v33 >= 500 ) 15457 || (signed int)v33 >= 500 )
15458 goto LABEL_92; 15458 goto LABEL_92;
15459 v34 = *(int *)&aSbwb00[4 * pParty->pPickedItem.uItemID + 4]; 15459 v34 = *(int *)&aSbwb00[4 * pParty->pPickedItem.uItemID + 4];
15460 a2.y = (int)v29 << 7; 15460 a2.y = (int)v29 << 7;
15466 if ( pParty->pPickedItem.uItemID != 263 15466 if ( pParty->pPickedItem.uItemID != 263
15467 || (v27->UpdateTempBonus(pParty->uTimePlayed), v30 = v27->uItemID, (signed int)v27->uItemID >= 64) 15467 || (v27->UpdateTempBonus(pParty->uTimePlayed), v30 = v27->uItemID, (signed int)v27->uItemID >= 64)
15468 && (signed int)v30 <= 65 15468 && (signed int)v30 <= 65
15469 || (pOut.y = v27->uAttributes, pOut.y & 2) 15469 || (pOut.y = v27->uAttributes, pOut.y & 2)
15470 || v27->uSpecEnchantmentType 15470 || v27->uSpecEnchantmentType
15471 || v27->uEncantmentType 15471 || v27->uEnchantmentType
15472 || v51 && v51 != 1 && v51 != 2 15472 || v51 && v51 != 1 && v51 != 2
15473 || (signed int)v30 >= 500 ) 15473 || (signed int)v30 >= 500 )
15474 goto LABEL_92; 15474 goto LABEL_92;
15475 a2.y = (int)v29 << 7; 15475 a2.y = (int)v29 << 7;
15476 v27->uSpecEnchantmentType = 40; 15476 v27->uSpecEnchantmentType = 40;
15484 v27->uAttributes = v32; 15484 v27->uAttributes = v32;
15485 } 15485 }
15486 dword_50C9A8 = 256; 15486 dword_50C9A8 = 256;
15487 goto LABEL_92; 15487 goto LABEL_92;
15488 } 15488 }
15489 v36 = (70.0 - (double)pParty->pPickedItem.uEncantmentType) * 0.01; 15489 v36 = (70.0 - (double)pParty->pPickedItem.uEnchantmentType) * 0.01;
15490 if ( v36 < 0.0 ) 15490 if ( v36 < 0.0 )
15491 v36 = 0.0; 15491 v36 = 0.0;
15492 if ( v51 != 12 ) 15492 if ( v51 != 12 )
15493 { 15493 {
15494 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 15494 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0);
15633 v19 = v0->AddItem(0xFFFFFFFFu, 0xDCu); 15633 v19 = v0->AddItem(0xFFFFFFFFu, 0xDCu);
15634 if ( v19 ) 15634 if ( v19 )
15635 *(int *)&v0->field_1F5[36 * v19 + 15] = 1; 15635 *(int *)&v0->field_1F5[36 * v19 + 15] = 1;
15636 v20 = v47 + 50 * v15; 15636 v20 = v47 + 50 * v15;
15637 v0->pInventoryItems[pOut.z].uItemID = v51; 15637 v0->pInventoryItems[pOut.z].uItemID = v51;
15638 v0->pInventoryItems[pOut.z].uEncantmentType = (pParty->pPickedItem.uEncantmentType 15638 v0->pInventoryItems[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType
15639 + v0->pInventoryItems[pOut.z].uEncantmentType) 15639 + v0->pInventoryItems[pOut.z].uEnchantmentType)
15640 / 2; 15640 / 2;
15641 v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168 + 388 15641 v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168 + 388
15642 LABEL_74: 15642 LABEL_74:
15643 v22 = (int)((char *)v0 + 36 * pOut.z); 15643 v22 = (int)((char *)v0 + 36 * pOut.z);
15644 if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) ) 15644 if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) )
15651 if ( v45 ) 15651 if ( v45 )
15652 { 15652 {
15653 if ( *(int *)(a2.y + 532) == 221 ) 15653 if ( *(int *)(a2.y + 532) == 221 )
15654 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID; 15654 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID;
15655 else 15655 else
15656 *(int *)(a2.y + 536) = pParty->pPickedItem.uEncantmentType; 15656 *(int *)(a2.y + 536) = pParty->pPickedItem.uEnchantmentType;
15657 v21 = v0->AddItem(0xFFFFFFFFu, 0xDCu); 15657 v21 = v0->AddItem(0xFFFFFFFFu, 0xDCu);
15658 if ( v21 ) 15658 if ( v21 )
15659 *(int *)&v0->field_1F5[36 * v21 + 15] = 1; 15659 *(int *)&v0->field_1F5[36 * v21 + 15] = 1;
15660 goto LABEL_74; 15660 goto LABEL_74;
15661 } 15661 }