Mercurial > mm7
diff Player.cpp @ 243:a6a8fa73b4ec
cleaning
author | zipi |
---|---|
date | Sun, 17 Feb 2013 23:40:46 +0000 |
parents | 47e06334c564 |
children | 37dcbe8f3cca |
line wrap: on
line diff
--- a/Player.cpp Sun Feb 17 23:04:07 2013 +0000 +++ b/Player.cpp Sun Feb 17 23:40:46 2013 +0000 @@ -6977,7 +6977,7 @@ unsigned int thisa; // [sp+28h] [bp-4h]@22 thisb = this; - v3 = &pParty->pPlayers[a2-1];//(Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552]; + v3 = &pParty->pPlayers[a2-1]; v73 = 1; if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) ) return; @@ -7005,7 +7005,7 @@ } v69 = 2; LABEL_111: - pParty->pPlayers[a2-1].Heal(v69);//((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->Heal(v69); + pParty->pPlayers[a2-1].Heal(v69); } LABEL_112: v3->PlaySound(SPEECH_36, 0); @@ -7178,7 +7178,7 @@ v33 = HIDWORD(v3->pConditions[15]); v34 = LODWORD(v3->pConditions[16]); v35 = HIDWORD(v3->pConditions[16]); - memset(&pParty->pPlayers[a2-1],0,0xA0u);//memset(&stru_AA1058[3].pSounds[6972 * a2 + 40552], 0, 0xA0u); + memset(&pParty->pPlayers[a2-1],0,0xA0u); HIDWORD(v3->pConditions[14]) = v31; LODWORD(v3->pConditions[15]) = v32; HIDWORD(v3->pConditions[15]) = v33; @@ -7549,7 +7549,7 @@ pMouse->RemoveHoldingItem(); return; } - if ( pParty->pPlayers[a2-1].CanAct() )//if ( ((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) + if ( pParty->pPlayers[a2-1].CanAct() ) { sub_467F48(pParty->pPickedItem.uItemID); v65 = 0; @@ -7593,7 +7593,7 @@ pAudioPlayer->PlaySound(v37, v39, v41, v43, v45, v48, v52, v61); return; } - if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) + if ( !pParty->pPlayers[a2-1].CanAct() ) { v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; v57 = pGlobalTXT_LocalizationStrings[382]; @@ -7705,7 +7705,7 @@ } if ( pCurrentScreen == SCREEN_CASTING ) return; - if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) + if ( !pParty->pPlayers[a2-1].CanAct() ) goto LABEL_89; if ( bUnderwater == 1 ) {