Mercurial > mm7

diff mm7_5.cpp @ 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 2f45768fcb7a
children 0f62a2b8bd0a
line wrap: on
line diff
--- 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;
           }