Mercurial > mm7
diff Player.cpp @ 100:81e93310f73c
rest screen, enemy status color fixed
author | zipi |
---|---|
date | Thu, 07 Feb 2013 22:23:10 +0000 |
parents | 448b02e9b8a3 |
children | acff5a5d563b |
line wrap: on
line diff
--- a/Player.cpp Thu Feb 07 21:02:19 2013 +0000 +++ b/Player.cpp Thu Feb 07 22:23:10 2013 +0000 @@ -6995,7 +6995,7 @@ goto LABEL_173; } LABEL_172: - ((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->SetCondition(6u, 1); + pParty->pPlayers[a2-1].SetCondition(6u, 1); goto LABEL_173; } if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == 14 ) @@ -7760,7 +7760,7 @@ char v20; // cl@124 DDM_DLV_Header *v21; // eax@126 unsigned int v22; // edi@129 - ItemGen *v23; // esi@134 + Player *v23; // esi@134 ItemGen *v24; // ecx@135 signed int v25; // edx@135 ITEM_EQUIP_TYPE v26; // ebx@155 @@ -7835,10 +7835,10 @@ goto _cmp_against_arg; case VAR_CircusPrises: v4 = 0; - v23 = pParty->pPlayers[0].pInventoryItems; + v23 = pParty->pPlayers;//[0].pInventoryItems; do { - v24 = v23; + v24 = v23->pInventoryItems; v25 = 138; do { @@ -7858,9 +7858,9 @@ --v25; } while ( v25 ); - v23 = (ItemGen *)((char *)v23 + 6972); + ++v23; } - while ( (signed int)v23 < (signed int)&pParty->field_777C[85] ); + while ( v23 <= &pParty->pPlayers[3] ); goto _cmp_against_arg; case VAR_MonthEquals2: v17 = pParty->uCurrentMonth == a1;