Mercurial > mm7

comparison Actor.cpp @ 1965:182d49f28170

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[21] to pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS]
author Grumpy7
date Fri, 25 Oct 2013 11:23:34 -0700
parents 2b6c6ff66823
children 7840fe323f67
comparison
equal deleted inserted replaced
1964:2b6c6ff66823 1965:182d49f28170
551 case SPELL_BODY_HAMMERHANDS: 551 case SPELL_BODY_HAMMERHANDS:
552 if ( (signed int)masteryLevel <= 0 || (signed int)masteryLevel > 4 ) 552 if ( (signed int)masteryLevel <= 0 || (signed int)masteryLevel > 4 )
553 v51 = 0; 553 v51 = 0;
554 else 554 else
555 v51 = 3600 * realPoints; 555 v51 = 3600 * realPoints;
556 actorPtr->pActorBuffs[21].Apply( 556 actorPtr->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].Apply(
557 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v51 << 7) * 0.033333335), 557 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v51 << 7) * 0.033333335),
558 masteryLevel, 558 masteryLevel,
559 realPoints, 559 realPoints,
560 0, 560 0,
561 0); 561 0);
1429 case 0: 1429 case 0:
1430 if ( this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) 1430 if ( this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
1431 v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower; 1431 v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
1432 if ( this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime > 0 && this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower > v2 ) 1432 if ( this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime > 0 && this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower > v2 )
1433 v2 = this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower; 1433 v2 = this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower;
1434 if ( this->pActorBuffs[21].uExpireTime > 0 ) 1434 if ( this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime > 0 )
1435 v2 += this->pActorBuffs[21].uPower; 1435 v2 += this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uPower;
1436 v3 = this->pMonsterInfo.uAttack1DamageDiceRolls; 1436 v3 = this->pMonsterInfo.uAttack1DamageDiceRolls;
1437 v4 = this->pMonsterInfo.uAttack1DamageDiceSides; 1437 v4 = this->pMonsterInfo.uAttack1DamageDiceSides;
1438 v5 = this->pMonsterInfo.uAttack1DamageBonus; 1438 v5 = this->pMonsterInfo.uAttack1DamageBonus;
1439 break; 1439 break;
1440 case 1: 1440 case 1: