Mercurial > mm7

comparison Player.cpp @ 1694:5ead2688a227

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
author Grumpy7
date Sun, 22 Sep 2013 10:04:33 +0200
parents 861ede68187a
children 33df22a5e376
comparison
equal deleted inserted replaced
1693:861ede68187a 1694:5ead2688a227
2266 PlaySound(SPEECH_24, 0); 2266 PlaySound(SPEECH_24, 0);
2267 return recieved_dmg; 2267 return recieved_dmg;
2268 } 2268 }
2269 2269
2270 //----- (0048DCF6) -------------------------------------------------------- 2270 //----- (0048DCF6) --------------------------------------------------------
2271 int Player::_48DCF6(int a2, Actor *pActor) //TODO check this with IDA to see what the uninitialized vars are supposed to contain 2271 int Player::ReceiveSpecialAttackEffect(int a2, Actor *pActor) //TODO check this with IDA to see what the uninitialized vars are supposed to contain
2272 { 2272 {
2273 signed int v3; // edi@1 2273 signed int v3; // edi@1
2274 signed int v4; // ebx@1 2274 signed int v4; // ebx@1
2275 int v6; // eax@2 2275 int v6; // eax@2
2276 int v8; // eax@8 2276 int v8; // eax@8
7506 } 7506 }
7507 if ( !(dword_6BE368_debug_settings_2 & 0x10) 7507 if ( !(dword_6BE368_debug_settings_2 & 0x10)
7508 && actorPtr->pMonsterInfo.uSpecialAttackType 7508 && actorPtr->pMonsterInfo.uSpecialAttackType
7509 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel ) 7509 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
7510 { 7510 {
7511 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); 7511 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr);
7512 } 7512 }
7513 } 7513 }
7514 if ( !pParty->bTurnBasedModeOn ) 7514 if ( !pParty->bTurnBasedModeOn )
7515 { 7515 {
7516 int actEndurance = playerPtr->GetActualEndurance(); 7516 int actEndurance = playerPtr->GetActualEndurance();
7697 if ( !element 7697 if ( !element
7698 && !(dword_6BE368_debug_settings_2 & 0x10) 7698 && !(dword_6BE368_debug_settings_2 & 0x10)
7699 && actorPtr->pMonsterInfo.uSpecialAttackType 7699 && actorPtr->pMonsterInfo.uSpecialAttackType
7700 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel ) 7700 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
7701 { 7701 {
7702 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); 7702 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr);
7703 } 7703 }
7704 if ( !pParty->bTurnBasedModeOn ) 7704 if ( !pParty->bTurnBasedModeOn )
7705 { 7705 {
7706 int actEnd = playerPtr->GetActualEndurance(); 7706 int actEnd = playerPtr->GetActualEndurance();
7707 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd)) 7707 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd))