Mercurial > mm7

comparison Player.cpp @ 2064:74f06d8a8017

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Mon, 02 Dec 2013 20:43:28 +0600
parents b2a434d65344
children a290d9fbdc95
comparison
equal deleted inserted replaced
2063:7890930801a8 2064:74f06d8a8017
7347 break; 7347 break;
7348 default: 7348 default:
7349 case 5: damageType = 4; //yes, the original just assigned the value 4 7349 case 5: damageType = 4; //yes, the original just assigned the value 4
7350 break; 7350 break;
7351 } 7351 }
7352 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) 7352 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) )
7353 { 7353 {
7354 dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); 7354 dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType);
7355 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) 7355 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 )
7356 { 7356 {
7357 int actorState = actorPtr->uAIState; 7357 int actorState = actorPtr->uAIState;
7384 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); 7384 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0);
7385 } 7385 }
7386 } 7386 }
7387 } 7387 }
7388 } 7388 }
7389 if ( !(dword_6BE368_debug_settings_2 & 0x10) 7389 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE)
7390 && actorPtr->pMonsterInfo.uSpecialAttackType 7390 && actorPtr->pMonsterInfo.uSpecialAttackType
7391 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel ) 7391 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
7392 { 7392 {
7393 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); 7393 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr);
7394 } 7394 }
7539 break; 7539 break;
7540 case 5: 7540 case 5:
7541 damageType = 4; 7541 damageType = 4;
7542 break; 7542 break;
7543 } 7543 }
7544 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) 7544 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) )
7545 { 7545 {
7546 int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); 7546 int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType);
7547 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) 7547 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 )
7548 { 7548 {
7549 unsigned __int16 actorState = actorPtr->uAIState; 7549 unsigned __int16 actorState = actorPtr->uAIState;
7578 } 7578 }
7579 } 7579 }
7580 } 7580 }
7581 } 7581 }
7582 if ( !dmgSource 7582 if ( !dmgSource
7583 && !(dword_6BE368_debug_settings_2 & 0x10) 7583 && !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE)
7584 && actorPtr->pMonsterInfo.uSpecialAttackType 7584 && actorPtr->pMonsterInfo.uSpecialAttackType
7585 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel ) 7585 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
7586 { 7586 {
7587 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); 7587 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr);
7588 } 7588 }