Mercurial > mm7

comparison Player.cpp @ 42:2bcc7b24c831

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stats screen fixes, and boundary fixes
author zipi
date Sun, 20 Jan 2013 21:58:23 +0000
parents 352b15291822
children e753d08b78ec
comparison
equal deleted inserted replaced
41:fc3016f5a07a 42:2bcc7b24c831
6957 int v75; // [sp+24h] [bp-8h]@73 6957 int v75; // [sp+24h] [bp-8h]@73
6958 Player *thisb; // [sp+28h] [bp-4h]@1 6958 Player *thisb; // [sp+28h] [bp-4h]@1
6959 unsigned int thisa; // [sp+28h] [bp-4h]@22 6959 unsigned int thisa; // [sp+28h] [bp-4h]@22
6960 6960
6961 thisb = this; 6961 thisb = this;
6962 v3 = (Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552]; 6962 v3 = &pParty->pPlayers[a2-1];//(Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552];
6963 v73 = 1; 6963 v73 = 1;
6964 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) ) 6964 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) )
6965 return; 6965 return;
6966 v4 = 0; 6966 v4 = 0;
6967 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == 13 ) 6967 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == 13 )
6985 v58 = pGlobalTXT_LocalizationStrings[36]; 6985 v58 = pGlobalTXT_LocalizationStrings[36];
6986 goto LABEL_90; 6986 goto LABEL_90;
6987 } 6987 }
6988 v69 = 2; 6988 v69 = 2;
6989 LABEL_111: 6989 LABEL_111:
6990 ((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->Heal(v69); 6990 pParty->pPlayers[a2-1].Heal(v69);//((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->Heal(v69);
6991 } 6991 }
6992 LABEL_112: 6992 LABEL_112:
6993 v3->PlaySound(36, 0); 6993 v3->PlaySound(36, 0);
6994 goto LABEL_173; 6994 goto LABEL_173;
6995 } 6995 }
7158 v31 = HIDWORD(v3->pConditions[14]); 7158 v31 = HIDWORD(v3->pConditions[14]);
7159 v32 = LODWORD(v3->pConditions[15]); 7159 v32 = LODWORD(v3->pConditions[15]);
7160 v33 = HIDWORD(v3->pConditions[15]); 7160 v33 = HIDWORD(v3->pConditions[15]);
7161 v34 = LODWORD(v3->pConditions[16]); 7161 v34 = LODWORD(v3->pConditions[16]);
7162 v35 = HIDWORD(v3->pConditions[16]); 7162 v35 = HIDWORD(v3->pConditions[16]);
7163 memset(&stru_AA1058[3].pSounds[6972 * a2 + 40552], 0, 0xA0u); 7163 memset(&pParty->pPlayers[a2-1],0,0xA0u);//memset(&stru_AA1058[3].pSounds[6972 * a2 + 40552], 0, 0xA0u);
7164 HIDWORD(v3->pConditions[14]) = v31; 7164 HIDWORD(v3->pConditions[14]) = v31;
7165 LODWORD(v3->pConditions[15]) = v32; 7165 LODWORD(v3->pConditions[15]) = v32;
7166 HIDWORD(v3->pConditions[15]) = v33; 7166 HIDWORD(v3->pConditions[15]) = v33;
7167 LODWORD(v3->pConditions[16]) = v34; 7167 LODWORD(v3->pConditions[16]) = v34;
7168 LODWORD(v3->pConditions[14]) = v30; 7168 LODWORD(v3->pConditions[14]) = v30;
7529 } 7529 }
7530 LABEL_187: 7530 LABEL_187:
7531 pMouse->RemoveHoldingItem(); 7531 pMouse->RemoveHoldingItem();
7532 return; 7532 return;
7533 } 7533 }
7534 if ( ((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) 7534 if ( pParty->pPlayers[a2-1].CanAct() )//if ( ((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() )
7535 { 7535 {
7536 sub_467F48(pParty->pPickedItem.uItemID); 7536 sub_467F48(pParty->pPickedItem.uItemID);
7537 v65 = 0; 7537 v65 = 0;
7538 v56 = 37; 7538 v56 = 37;
7539 LABEL_67: 7539 LABEL_67:
7573 v14 = pAudioPlayer; 7573 v14 = pAudioPlayer;
7574 LABEL_63: 7574 LABEL_63:
7575 pAudioPlayer->PlaySound(v37, v39, v41, v43, v45, v48, v52, v61); 7575 pAudioPlayer->PlaySound(v37, v39, v41, v43, v45, v48, v52, v61);
7576 return; 7576 return;
7577 } 7577 }
7578 if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) 7578 if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() )
7579 { 7579 {
7580 v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; 7580 v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()];
7581 v57 = pGlobalTXT_LocalizationStrings[382]; 7581 v57 = pGlobalTXT_LocalizationStrings[382];
7582 goto LABEL_72; 7582 goto LABEL_72;
7583 } 7583 }
7685 v21 = v67; 7685 v21 = v67;
7686 goto LABEL_83; 7686 goto LABEL_83;
7687 } 7687 }
7688 if ( pCurrentScreen == 23 ) 7688 if ( pCurrentScreen == 23 )
7689 return; 7689 return;
7690 if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) 7690 if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() )
7691 goto LABEL_89; 7691 goto LABEL_89;
7692 if ( bUnderwater == 1 ) 7692 if ( bUnderwater == 1 )
7693 { 7693 {
7694 v23 = pGlobalTXT_LocalizationStrings[652]; 7694 v23 = pGlobalTXT_LocalizationStrings[652];
7695 goto LABEL_91; 7695 goto LABEL_91;