Mercurial > mm7

changeset 1954:730166317ed0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[10] to pActorBuffs[ACTOR_BUFF_MASS_DISTORTION]
author Grumpy7
date Fri, 25 Oct 2013 11:15:57 -0700
parents 23cb27a497a0
children 0c5326e2044a
files CastSpellInfo.cpp Indoor.cpp Outdoor.cpp stru6.cpp
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/CastSpellInfo.cpp	Fri Oct 25 11:15:18 2013 -0700
+++ b/CastSpellInfo.cpp	Fri Oct 25 11:15:57 2013 -0700
@@ -651,7 +651,7 @@
 				LODWORD(v727) = 1;
 				break;
 			}
-			pActors[PID_ID(a2)].pActorBuffs[10].Apply(pMiscTimer->uTotalGameTimeElapsed + 128, 0, 0, 0, 0);
+			pActors[PID_ID(a2)].pActorBuffs[ACTOR_BUFF_MASS_DISTORTION].Apply(pMiscTimer->uTotalGameTimeElapsed + 128, 0, 0, 0, 0);
 			v704.x = 0;
 			v704.y = 0;
 			v704.z = 0;
--- a/Indoor.cpp	Fri Oct 25 11:15:18 2013 -0700
+++ b/Indoor.cpp	Fri Oct 25 11:15:57 2013 -0700
@@ -4622,7 +4622,7 @@
     v0->_screenspace_y_scaler_packedfloat = a5a;
     if ( (signed __int64)p->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime <= 0 )
     {
-      if ( (signed __int64)p->pActorBuffs[10].uExpireTime > 0 )
+      if ( (signed __int64)p->pActorBuffs[ACTOR_BUFF_MASS_DISTORTION].uExpireTime > 0 )
       {
         a5b = (unsigned __int64)(pGame->pStru6Instance->_4A806F(p) * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
         goto LABEL_43;
--- a/Outdoor.cpp	Fri Oct 25 11:15:18 2013 -0700
+++ b/Outdoor.cpp	Fri Oct 25 11:15:57 2013 -0700
@@ -3067,7 +3067,7 @@
         v28->_screenspace_y_scaler_packedfloat = (unsigned __int64)(v15->scale * (signed __int64)v57) >> 16;
         if ( v31 || v31 | v30 && LODWORD(actor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime) <= 0u )
         {
-          if ( (signed __int64)actor->pActorBuffs[10].uExpireTime > 0i64 )
+          if ( (signed __int64)actor->pActorBuffs[ACTOR_BUFF_MASS_DISTORTION].uExpireTime > 0i64 )
           {
             v52 = (unsigned __int64)(pGame->pStru6Instance->_4A806F(actor)
                                    * (signed __int64)v28->_screenspace_y_scaler_packedfloat) >> 16;
--- a/stru6.cpp	Fri Oct 25 11:15:18 2013 -0700
+++ b/stru6.cpp	Fri Oct 25 11:15:57 2013 -0700
@@ -735,12 +735,12 @@
   float v5; // ST00_4@6
 
   v2 = (int)pActor;
-  v3 = LODWORD(pActor->pActorBuffs[10].uExpireTime) - pMiscTimer->uTotalGameTimeElapsed;
+  v3 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_MASS_DISTORTION].uExpireTime) - pMiscTimer->uTotalGameTimeElapsed;
   if ( (signed int)v3 <= 64 )
   {
     if ( (v3 & 0x80000000u) != 0 )
     {
-      pActor->pActorBuffs[10].uExpireTime = 0i64;
+      pActor->pActorBuffs[ACTOR_BUFF_MASS_DISTORTION].uExpireTime = 0i64;
       v4 = 1.0;
     }
     else