Mercurial > mm7

changeset 1961:592d604088b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[17] to pActorBuffs[ACTOR_BUFF_BLESS]
author Grumpy7
date Fri, 25 Oct 2013 11:21:05 -0700
parents f92fc67d66cb
children 39a68477ead3
files Actor.cpp mm7_6.cpp
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:20:24 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:21:05 2013 -0700
@@ -504,7 +504,7 @@
         v42 = 1200 * realPoints + 3840;
       else
         v42 = 0;
-      actorPtr->pActorBuffs[17].Apply(
+      actorPtr->pActorBuffs[ACTOR_BUFF_BLESS].Apply(
         pParty->uTimePlayed + (signed int)(signed __int64)((double)(v42 << 7) * 0.033333335),
         masteryLevel,
         realPoints + 5,
--- a/mm7_6.cpp	Fri Oct 25 11:20:24 2013 -0700
+++ b/mm7_6.cpp	Fri Oct 25 11:21:05 2013 -0700
@@ -345,12 +345,12 @@
 		}
 	case 46:
 		{
-		if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) < 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime) < 0 )
 			return 1;
-		if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) > 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime) > 0 )
 			return 0;
 		v3 = 0;
-		v4 = LODWORD(pActor->pActorBuffs[17].uExpireTime) == 0;
+		v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime) == 0;
 		break;
 		}
 	case 47:
@@ -473,8 +473,8 @@
   v10 = v7 + v6;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
     a2a = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
-  if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > a2a )
-    a2a = pActor->pActorBuffs[17].uPower;
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime > 0 && pActor->pActorBuffs[ACTOR_BUFF_BLESS].uPower > a2a )
+    a2a = pActor->pActorBuffs[ACTOR_BUFF_BLESS].uPower;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
   {
     a2a += pActor->pActorBuffs[ACTOR_BUFF_FATE].uPower;
@@ -493,8 +493,8 @@
   v3 = 0;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
     v3 = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
-  if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > v3 )
-    v3 = pActor->pActorBuffs[17].uPower;
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime > 0 && pActor->pActorBuffs[ACTOR_BUFF_BLESS].uPower > v3 )
+    v3 = pActor->pActorBuffs[ACTOR_BUFF_BLESS].uPower;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
   {
     v3 += pActor->pActorBuffs[ACTOR_BUFF_FATE].uPower;