Mercurial > mm7

changeset 1959:4fbffad6e011

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[15] to pActorBuffs[ACTOR_BUFF_SHIELD]
author Grumpy7
date Fri, 25 Oct 2013 11:19:41 -0700
parents 95095c2a5e19
children f92fc67d66cb
files Actor.cpp mm7_5.cpp mm7_6.cpp
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:19:01 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:19:41 2013 -0700
@@ -468,7 +468,7 @@
         v8 = 3600 * (realPoints + 64);
       else
         v8 = 0;
-      actorPtr->pActorBuffs[15].Apply(
+      actorPtr->pActorBuffs[ACTOR_BUFF_SHIELD].Apply(
         pParty->uTimePlayed + (signed int)(signed __int64)((double)(v8 << 7) * 0.033333335),
         masteryLevel,
         0,
--- a/mm7_5.cpp	Fri Oct 25 11:19:01 2013 -0700
+++ b/mm7_5.cpp	Fri Oct 25 11:19:41 2013 -0700
@@ -459,9 +459,9 @@
           if ( a4 - HIDWORD(v10) == 1 )
           {
             v12 = v8->pMonsterInfo.uAttack2Type;
-            if ( SHIDWORD(v7->pActorBuffs[15].uExpireTime) >= SHIDWORD(v10)
-              && (SHIDWORD(v7->pActorBuffs[15].uExpireTime) > SHIDWORD(v10)
-               || LODWORD(v7->pActorBuffs[15].uExpireTime) > HIDWORD(v10)) )
+            if ( SHIDWORD(v7->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) >= SHIDWORD(v10)
+              && (SHIDWORD(v7->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) > SHIDWORD(v10)
+               || LODWORD(v7->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) > HIDWORD(v10)) )
               LODWORD(v10) = (signed int)v10 >> 1;
             goto LABEL_30;
           }
--- a/mm7_6.cpp	Fri Oct 25 11:19:01 2013 -0700
+++ b/mm7_6.cpp	Fri Oct 25 11:19:41 2013 -0700
@@ -326,12 +326,12 @@
 		}
 	case 17:
 		{
-		if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) < 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) < 0 )
 			return 1;
-		if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) > 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) > 0 )
 			return 0;
 		v3 = 0;
-		v4 = LODWORD(pActor->pActorBuffs[15].uExpireTime) == 0;
+		v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) == 0;
 		break;
 		}
 	case 38:
@@ -407,7 +407,7 @@
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime > 0 )
     v5 /= 2;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
-    v6 = pActor->pActorBuffs[15].uPower;
+    v6 = pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uPower;
   if ( (signed __int64)pActor->pActorBuffs[16].uExpireTime > 0 && pActor->pActorBuffs[16].uPower > v6 )
     v6 = pActor->pActorBuffs[16].uPower;
   v7 = v6 + v5;