Mercurial > mm7
comparison Player.cpp @ 243:a6a8fa73b4ec
cleaning
author | zipi |
---|---|
date | Sun, 17 Feb 2013 23:40:46 +0000 |
parents | 47e06334c564 |
children | 37dcbe8f3cca |
comparison
equal
deleted
inserted
replaced
242:578b4a1e58ba | 243:a6a8fa73b4ec |
---|---|
6975 int v75; // [sp+24h] [bp-8h]@73 | 6975 int v75; // [sp+24h] [bp-8h]@73 |
6976 Player *thisb; // [sp+28h] [bp-4h]@1 | 6976 Player *thisb; // [sp+28h] [bp-4h]@1 |
6977 unsigned int thisa; // [sp+28h] [bp-4h]@22 | 6977 unsigned int thisa; // [sp+28h] [bp-4h]@22 |
6978 | 6978 |
6979 thisb = this; | 6979 thisb = this; |
6980 v3 = &pParty->pPlayers[a2-1];//(Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552]; | 6980 v3 = &pParty->pPlayers[a2-1]; |
6981 v73 = 1; | 6981 v73 = 1; |
6982 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) ) | 6982 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) ) |
6983 return; | 6983 return; |
6984 v4 = 0; | 6984 v4 = 0; |
6985 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == 13 ) | 6985 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == 13 ) |
7003 v58 = pGlobalTXT_LocalizationStrings[36]; | 7003 v58 = pGlobalTXT_LocalizationStrings[36]; |
7004 goto LABEL_90; | 7004 goto LABEL_90; |
7005 } | 7005 } |
7006 v69 = 2; | 7006 v69 = 2; |
7007 LABEL_111: | 7007 LABEL_111: |
7008 pParty->pPlayers[a2-1].Heal(v69);//((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->Heal(v69); | 7008 pParty->pPlayers[a2-1].Heal(v69); |
7009 } | 7009 } |
7010 LABEL_112: | 7010 LABEL_112: |
7011 v3->PlaySound(SPEECH_36, 0); | 7011 v3->PlaySound(SPEECH_36, 0); |
7012 goto LABEL_173; | 7012 goto LABEL_173; |
7013 } | 7013 } |
7176 v31 = HIDWORD(v3->pConditions[14]); | 7176 v31 = HIDWORD(v3->pConditions[14]); |
7177 v32 = LODWORD(v3->pConditions[15]); | 7177 v32 = LODWORD(v3->pConditions[15]); |
7178 v33 = HIDWORD(v3->pConditions[15]); | 7178 v33 = HIDWORD(v3->pConditions[15]); |
7179 v34 = LODWORD(v3->pConditions[16]); | 7179 v34 = LODWORD(v3->pConditions[16]); |
7180 v35 = HIDWORD(v3->pConditions[16]); | 7180 v35 = HIDWORD(v3->pConditions[16]); |
7181 memset(&pParty->pPlayers[a2-1],0,0xA0u);//memset(&stru_AA1058[3].pSounds[6972 * a2 + 40552], 0, 0xA0u); | 7181 memset(&pParty->pPlayers[a2-1],0,0xA0u); |
7182 HIDWORD(v3->pConditions[14]) = v31; | 7182 HIDWORD(v3->pConditions[14]) = v31; |
7183 LODWORD(v3->pConditions[15]) = v32; | 7183 LODWORD(v3->pConditions[15]) = v32; |
7184 HIDWORD(v3->pConditions[15]) = v33; | 7184 HIDWORD(v3->pConditions[15]) = v33; |
7185 LODWORD(v3->pConditions[16]) = v34; | 7185 LODWORD(v3->pConditions[16]) = v34; |
7186 LODWORD(v3->pConditions[14]) = v30; | 7186 LODWORD(v3->pConditions[14]) = v30; |
7547 } | 7547 } |
7548 LABEL_187: | 7548 LABEL_187: |
7549 pMouse->RemoveHoldingItem(); | 7549 pMouse->RemoveHoldingItem(); |
7550 return; | 7550 return; |
7551 } | 7551 } |
7552 if ( pParty->pPlayers[a2-1].CanAct() )//if ( ((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) | 7552 if ( pParty->pPlayers[a2-1].CanAct() ) |
7553 { | 7553 { |
7554 sub_467F48(pParty->pPickedItem.uItemID); | 7554 sub_467F48(pParty->pPickedItem.uItemID); |
7555 v65 = 0; | 7555 v65 = 0; |
7556 v56 = SPEECH_37; | 7556 v56 = SPEECH_37; |
7557 LABEL_67: | 7557 LABEL_67: |
7591 v14 = pAudioPlayer; | 7591 v14 = pAudioPlayer; |
7592 LABEL_63: | 7592 LABEL_63: |
7593 pAudioPlayer->PlaySound(v37, v39, v41, v43, v45, v48, v52, v61); | 7593 pAudioPlayer->PlaySound(v37, v39, v41, v43, v45, v48, v52, v61); |
7594 return; | 7594 return; |
7595 } | 7595 } |
7596 if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) | 7596 if ( !pParty->pPlayers[a2-1].CanAct() ) |
7597 { | 7597 { |
7598 v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | 7598 v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; |
7599 v57 = pGlobalTXT_LocalizationStrings[382]; | 7599 v57 = pGlobalTXT_LocalizationStrings[382]; |
7600 goto LABEL_72; | 7600 goto LABEL_72; |
7601 } | 7601 } |
7703 v21 = v67; | 7703 v21 = v67; |
7704 goto LABEL_83; | 7704 goto LABEL_83; |
7705 } | 7705 } |
7706 if ( pCurrentScreen == SCREEN_CASTING ) | 7706 if ( pCurrentScreen == SCREEN_CASTING ) |
7707 return; | 7707 return; |
7708 if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) | 7708 if ( !pParty->pPlayers[a2-1].CanAct() ) |
7709 goto LABEL_89; | 7709 goto LABEL_89; |
7710 if ( bUnderwater == 1 ) | 7710 if ( bUnderwater == 1 ) |
7711 { | 7711 { |
7712 v23 = pGlobalTXT_LocalizationStrings[652]; | 7712 v23 = pGlobalTXT_LocalizationStrings[652]; |
7713 goto LABEL_91; | 7713 goto LABEL_91; |