Mercurial > mm7

comparison Actor.cpp @ 1958:95095c2a5e19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[14] to pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER]
author Grumpy7
date Fri, 25 Oct 2013 11:19:01 -0700
parents 3d0c57c4fa83
children 4fbffad6e011
comparison
equal deleted inserted replaced
1957:3d0c57c4fa83 1958:95095c2a5e19
634 v94 = 900 * realPoints + 3840; 634 v94 = 900 * realPoints + 3840;
635 else if (masteryLevel == 4) 635 else if (masteryLevel == 4)
636 v94 = 1200 * realPoints + 3840; 636 v94 = 1200 * realPoints + 3840;
637 else 637 else
638 v94 = 0; 638 v94 = 0;
639 actorPtr->pActorBuffs[14].Apply( 639 actorPtr->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].Apply(
640 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v94 << 7) * 0.033333335), 640 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v94 << 7) * 0.033333335),
641 masteryLevel, 641 masteryLevel,
642 realPoints + 5, 642 realPoints + 5,
643 0, 643 0,
644 0); 644 0);
1425 v11 = 0; 1425 v11 = 0;
1426 1426
1427 switch( dmgSource ) 1427 switch( dmgSource )
1428 { 1428 {
1429 case 0: 1429 case 0:
1430 if ( this->pActorBuffs[14].uExpireTime > 0 ) 1430 if ( this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
1431 v2 = this->pActorBuffs[14].uPower; 1431 v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
1432 if ( this->pActorBuffs[18].uExpireTime > 0 && this->pActorBuffs[18].uPower > v2 ) 1432 if ( this->pActorBuffs[18].uExpireTime > 0 && this->pActorBuffs[18].uPower > v2 )
1433 v2 = this->pActorBuffs[18].uPower; 1433 v2 = this->pActorBuffs[18].uPower;
1434 if ( this->pActorBuffs[21].uExpireTime > 0 ) 1434 if ( this->pActorBuffs[21].uExpireTime > 0 )
1435 v2 += this->pActorBuffs[21].uPower; 1435 v2 += this->pActorBuffs[21].uPower;
1436 v3 = this->pMonsterInfo.uAttack1DamageDiceRolls; 1436 v3 = this->pMonsterInfo.uAttack1DamageDiceRolls;