Mercurial > mm7

changeset 1949:2f45768fcb7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[3] to pActorBuffs[ACTOR_BUFF_SHRINK]
author Grumpy7
date Fri, 25 Oct 2013 11:11:31 -0700
parents 7fd4bfa175fd
children 8509a59af88f
files Actor.cpp Indoor.cpp Outdoor.cpp Player.cpp mm7_5.cpp
diffstat 5 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:10:44 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:11:31 2013 -0700
@@ -2120,13 +2120,13 @@
   v3 = pActors[uActorID].pSoundSampleIDs[uSoundID];
   if ( v3 )
   {
-    if ( pActors[uActorID].pActorBuffs[3].uExpireTime <= 0 )
+    if ( pActors[uActorID].pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime <= 0 )
     {
       pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
     }
     else
     {
-      switch(pActors[uActorID].pActorBuffs[3].uPower)
+      switch(pActors[uActorID].pActorBuffs[ACTOR_BUFF_SHRINK].uPower)
       {
         case 1: 
           pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, 0, 0, 0, 0, 33075);
--- a/Indoor.cpp	Fri Oct 25 11:10:44 2013 -0700
+++ b/Indoor.cpp	Fri Oct 25 11:11:31 2013 -0700
@@ -4620,7 +4620,7 @@
       a5a = (unsigned __int64)(v10->scale * (signed __int64)v19) >> 16;
     }
     v0->_screenspace_y_scaler_packedfloat = a5a;
-    if ( (signed __int64)p->pActorBuffs[3].uExpireTime <= 0 )
+    if ( (signed __int64)p->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime <= 0 )
     {
       if ( (signed __int64)p->pActorBuffs[10].uExpireTime > 0 )
       {
@@ -4630,11 +4630,11 @@
     }
     else
     {
-      v22 = p->pActorBuffs[3].uPower;
+      v22 = p->pActorBuffs[ACTOR_BUFF_SHRINK].uPower;
       if ( v22 )
       {
         v23 = (unsigned __int64)(65536 / (unsigned __int16)v22 * (signed __int64)v0->_screenspace_x_scaler_packedfloat) >> 16;
-        v24 = p->pActorBuffs[3].uPower;
+        v24 = p->pActorBuffs[ACTOR_BUFF_SHRINK].uPower;
         v0->_screenspace_x_scaler_packedfloat = v23;
         a5b = (unsigned __int64)(65536 / v24 * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
 LABEL_43:
--- a/Outdoor.cpp	Fri Oct 25 11:10:44 2013 -0700
+++ b/Outdoor.cpp	Fri Oct 25 11:11:31 2013 -0700
@@ -3062,10 +3062,10 @@
         v28->uIndoorSectorID = 0;
         v28->uPalette = v15->uPaletteIndex;
         v28->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v15->scale * (signed __int64)v58) >> 16;
-        v30 = HIDWORD(actor->pActorBuffs[3].uExpireTime) == 0;
-        v31 = SHIDWORD(actor->pActorBuffs[3].uExpireTime) < 0;
+        v30 = HIDWORD(actor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime) == 0;
+        v31 = SHIDWORD(actor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime) < 0;
         v28->_screenspace_y_scaler_packedfloat = (unsigned __int64)(v15->scale * (signed __int64)v57) >> 16;
-        if ( v31 || v31 | v30 && LODWORD(actor->pActorBuffs[3].uExpireTime) <= 0u )
+        if ( v31 || v31 | v30 && LODWORD(actor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime) <= 0u )
         {
           if ( (signed __int64)actor->pActorBuffs[10].uExpireTime > 0i64 )
           {
@@ -3078,10 +3078,10 @@
         }
         else
         {
-          v32 = actor->pActorBuffs[3].uPower;
+          v32 = actor->pActorBuffs[ACTOR_BUFF_SHRINK].uPower;
           if ( v32 )
           {
-            v33 = actor->pActorBuffs[3].uPower;
+            v33 = actor->pActorBuffs[ACTOR_BUFF_SHRINK].uPower;
             v28->_screenspace_x_scaler_packedfloat = (unsigned __int64)(65536 / (unsigned __int16)v32 * (signed __int64)v28->_screenspace_x_scaler_packedfloat) >> 16;
             v52 = (unsigned __int64)(65536 / v33 * (signed __int64)v28->_screenspace_y_scaler_packedfloat) >> 16;
             goto LABEL_53;
--- a/Player.cpp	Fri Oct 25 11:10:44 2013 -0700
+++ b/Player.cpp	Fri Oct 25 11:11:31 2013 -0700
@@ -7299,9 +7299,9 @@
     }
     pAudioPlayer->PlaySound(soundToPlay, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0);
     int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource);
-    if ( actorPtr->pActorBuffs[3].uExpireTime > 0 )
+    if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 )
     {
-      __int16 spellPower = actorPtr->pActorBuffs[3].uPower;
+      __int16 spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower;
       if ( spellPower )
         dmgToReceive /= (signed int)spellPower;
     }
@@ -7486,9 +7486,9 @@
             dmgToReceive >>= 1;
         }
       }
-      if ( actorPtr->pActorBuffs[3].uExpireTime > 0 )
+      if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 )
       {
-        int spellPower = actorPtr->pActorBuffs[3].uPower;
+        int spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower;
         if ( spellPower )
           dmgToReceive /= (signed int)spellPower;
       }
--- a/mm7_5.cpp	Fri Oct 25 11:10:44 2013 -0700
+++ b/mm7_5.cpp	Fri Oct 25 11:11:31 2013 -0700
@@ -444,9 +444,9 @@
       if ( v6 )
       {
         v10 = (unsigned int)v8->_43B3E0_CalcDamage(a4);
-        if ( (signed __int64)v8->pActorBuffs[3].uExpireTime > 0 )
+        if ( (signed __int64)v8->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 )
         {
-          v11 = v8->pActorBuffs[3].uPower;
+          v11 = v8->pActorBuffs[ACTOR_BUFF_SHRINK].uPower;
           if ( v11 )
             v10 = (signed int)v10 / (unsigned __int16)v11;
         }