Mercurial > mm7
comparison mm7_5.cpp @ 277:24de34910d3e
Слияние
author | Ritor1 |
---|---|
date | Sun, 17 Feb 2013 17:41:36 +0600 |
parents | f809f0465769 1bd823f52e3a |
children | ccf14ac29caf |
comparison
equal
deleted
inserted
replaced
276:f809f0465769 | 277:24de34910d3e |
---|---|
15883 v20 = v47 + 50 * v15; | 15883 v20 = v47 + 50 * v15; |
15884 v0->pInventoryItems[pOut.z].uItemID = v51; | 15884 v0->pInventoryItems[pOut.z].uItemID = v51; |
15885 v0->pInventoryItems[pOut.z]._bonus_type = (pParty->pPickedItem._bonus_type | 15885 v0->pInventoryItems[pOut.z]._bonus_type = (pParty->pPickedItem._bonus_type |
15886 + v0->pInventoryItems[pOut.z]._bonus_type) | 15886 + v0->pInventoryItems[pOut.z]._bonus_type) |
15887 / 2; | 15887 / 2; |
15888 v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->field_10168[2 * v20 + 388]); | 15888 v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168 + 388 |
15889 LABEL_74: | 15889 LABEL_74: |
15890 v22 = (int)((char *)v0 + 36 * pOut.z); | 15890 v22 = (int)((char *)v0 + 36 * pOut.z); |
15891 if ( !BYTE2(pItemsTable->pItems[*(int *)(v22 + 532) + 1].uItemID) ) | 15891 if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) ) |
15892 *(int *)(v22 + 552) |= 1u; | 15892 *(int *)(v22 + 552) |= 1u; |
15893 if ( !dword_4E455C ) | 15893 if ( !dword_4E455C ) |
15894 goto LABEL_92; | 15894 goto LABEL_92; |
15895 v0->PlaySound(SPEECH_16, 0); | 15895 v0->PlaySound(SPEECH_16, 0); |
15896 goto LABEL_91; | 15896 goto LABEL_91; |