Mercurial > mm7

comparison Player.cpp @ 1693:861ede68187a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
author Grumpy7
date Sun, 22 Sep 2013 10:04:00 +0200
parents 92732b6fc196
children 5ead2688a227
comparison
equal deleted inserted replaced
1692:92732b6fc196 1693:861ede68187a
2468 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); 2468 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2469 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2469 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2470 return 1; 2470 return 1;
2471 break; 2471 break;
2472 case 9: 2472 case 9:
2473 SetCondition(Condition_Disease1, 1);
2474 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2475 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2476 return 1;
2477 break;
2478 case 10:
2479 SetCondition(Condition_Disease2, 1);
2480 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2481 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2482 return 1;
2483 break;
2484 case 11:
2473 SetCondition(Condition_Disease3, 1); 2485 SetCondition(Condition_Disease3, 1);
2474 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); 2486 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2475 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2487 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2476 return 1; 2488 return 1;
2477 break; 2489 break;
7491 } 7503 }
7492 } 7504 }
7493 } 7505 }
7494 } 7506 }
7495 if ( !(dword_6BE368_debug_settings_2 & 0x10) 7507 if ( !(dword_6BE368_debug_settings_2 & 0x10)
7496 && actorPtr->pMonsterInfo.uSpecialAttack 7508 && actorPtr->pMonsterInfo.uSpecialAttackType
7497 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackType ) 7509 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
7498 { 7510 {
7499 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttack, actorPtr); 7511 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr);
7500 } 7512 }
7501 } 7513 }
7502 if ( !pParty->bTurnBasedModeOn ) 7514 if ( !pParty->bTurnBasedModeOn )
7503 { 7515 {
7504 int actEndurance = playerPtr->GetActualEndurance(); 7516 int actEndurance = playerPtr->GetActualEndurance();
7682 } 7694 }
7683 } 7695 }
7684 } 7696 }
7685 if ( !element 7697 if ( !element
7686 && !(dword_6BE368_debug_settings_2 & 0x10) 7698 && !(dword_6BE368_debug_settings_2 & 0x10)
7687 && actorPtr->pMonsterInfo.uSpecialAttack 7699 && actorPtr->pMonsterInfo.uSpecialAttackType
7688 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackType ) 7700 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
7689 { 7701 {
7690 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttack, actorPtr); 7702 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr);
7691 } 7703 }
7692 if ( !pParty->bTurnBasedModeOn ) 7704 if ( !pParty->bTurnBasedModeOn )
7693 { 7705 {
7694 int actEnd = playerPtr->GetActualEndurance(); 7706 int actEnd = playerPtr->GetActualEndurance();
7695 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd)) 7707 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd))