diff mm7_5.cpp @ 277:24de34910d3e

Слияние
author Ritor1
date Sun, 17 Feb 2013 17:41:36 +0600
parents f809f0465769 1bd823f52e3a
children ccf14ac29caf
line wrap: on
line diff
--- a/mm7_5.cpp	Sun Feb 17 17:41:15 2013 +0600
+++ b/mm7_5.cpp	Sun Feb 17 17:41:36 2013 +0600
@@ -15885,10 +15885,10 @@
               v0->pInventoryItems[pOut.z]._bonus_type = (pParty->pPickedItem._bonus_type
                                                        + v0->pInventoryItems[pOut.z]._bonus_type)
                                                       / 2;
-              v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->field_10168[2 * v20 + 388]);
+              v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168  + 388
 LABEL_74:
               v22 = (int)((char *)v0 + 36 * pOut.z);
-              if ( !BYTE2(pItemsTable->pItems[*(int *)(v22 + 532) + 1].uItemID) )
+              if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) )
                 *(int *)(v22 + 552) |= 1u;
               if ( !dword_4E455C )
                 goto LABEL_92;