Mercurial > mm7

changeset 1962:39a68477ead3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[18] to pActorBuffs[ACTOR_BUFF_HEROISM]
author Grumpy7
date Fri, 25 Oct 2013 11:21:37 -0700
parents 592d604088b3
children 223143ef1289
files Actor.cpp mm7_6.cpp
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:21:05 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:21:37 2013 -0700
@@ -538,7 +538,7 @@
         v54 = 1200 * realPoints + 3840;
       else
         v54 = 0;
-      actorPtr->pActorBuffs[18].Apply(
+      actorPtr->pActorBuffs[ACTOR_BUFF_HEROISM].Apply(
         pParty->uTimePlayed + (signed int)(signed __int64)((double)(v54 << 7) * 0.033333335),
         masteryLevel,
         realPoints + 5,
@@ -1429,8 +1429,8 @@
     case 0: 
       if ( this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
         v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
-      if ( this->pActorBuffs[18].uExpireTime > 0 && this->pActorBuffs[18].uPower > v2 )
-        v2 = this->pActorBuffs[18].uPower;
+      if ( this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime > 0 && this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower > v2 )
+        v2 = this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower;
       if ( this->pActorBuffs[21].uExpireTime > 0 )
         v2 += this->pActorBuffs[21].uPower;
       v3 = this->pMonsterInfo.uAttack1DamageDiceRolls;
--- a/mm7_6.cpp	Fri Oct 25 11:21:05 2013 -0700
+++ b/mm7_6.cpp	Fri Oct 25 11:21:37 2013 -0700
@@ -365,12 +365,12 @@
 		}
 	case 51:
 		{
-		if ( SHIDWORD(pActor->pActorBuffs[18].uExpireTime) < 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime) < 0 )
 			return 1;
-		if ( SHIDWORD(pActor->pActorBuffs[18].uExpireTime) <= 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime) <= 0 )
 		{
 			v3 = 0;
-			v4 = LODWORD(pActor->pActorBuffs[18].uExpireTime) == 0;
+			v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime) == 0;
 		}
 		else
 			return 0;