Mercurial > mm7

changeset 1951:524fe0810f32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
author Grumpy7
date Fri, 25 Oct 2013 11:13:15 -0700
parents 8509a59af88f
children 4ed7d18abe93
files Actor.cpp CastSpellInfo.cpp Indoor.cpp TurnEngine.cpp mm7_3.cpp
diffstat 5 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:12:18 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:13:15 2013 -0700
@@ -1292,7 +1292,7 @@
     v3->uAIState = AttackingMelee;
     Actor::PlaySound(uActorID, 0);
     v25 = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
-    if ( v3->pActorBuffs[7].uExpireTime > 0 )
+    if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
     {
       v25 *= 2;
     }
@@ -1572,7 +1572,7 @@
     v3->uAIState = AttackingRanged4;
     Actor::PlaySound(uActorID, 0);
     pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
-    if (v3->pActorBuffs[7].uExpireTime > 0)
+    if (v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0)
     {
       pDira *= 2;
     }
@@ -1656,7 +1656,7 @@
     v3->uAIState = AttackingRanged3;
     Actor::PlaySound(uActorID, 0);
     pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
-    if (v3->pActorBuffs[7].uExpireTime > 0)
+    if (v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0)
     {
       pDira *= 2;
     }
@@ -1740,7 +1740,7 @@
     v3->uAIState = AttackingRanged2;
     Actor::PlaySound(uActorID, 0);
     pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
-    if ( v3->pActorBuffs[7].uExpireTime > 0 )
+    if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
     {
       pDira *= 2;
     }
@@ -1821,7 +1821,7 @@
     v3->uAIState = AttackingRanged1;
     Actor::PlaySound(uActorID, 0);
     pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
-    if ( v3->pActorBuffs[7].uExpireTime > 0 )
+    if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
     {
       pDira *= 2;
     }
--- a/CastSpellInfo.cpp	Fri Oct 25 11:12:18 2013 -0700
+++ b/CastSpellInfo.cpp	Fri Oct 25 11:13:15 2013 -0700
@@ -882,8 +882,8 @@
 			v58 = (signed __int64)((double)(23040 * v2) * 0.033333335);
 			//v59 = v721;
 			pActor = &pActors[PID_ID(a2)];
-			//((SpellBuff *)((char *)&pActors[0].pActorBuffs[7] + v721))->Apply(
-			pActor->pActorBuffs[7].Apply(pParty->uTimePlayed + (signed int)v58,	v731, amount, 0, 0);
+			//((SpellBuff *)((char *)&pActors[0].pActorBuffs[ACTOR_BUFF_SLOWED] + v721))->Apply(
+			pActor->pActorBuffs[ACTOR_BUFF_SLOWED].Apply(pParty->uTimePlayed + (signed int)v58,	v731, amount, 0, 0);
 			//*((char *)&pActors[0].uAttributes + v59 + 2) |= 8u;
 			BYTE2(pActor->uAttributes) |= 8u;
 			//v672 = 0;
--- a/Indoor.cpp	Fri Oct 25 11:12:18 2013 -0700
+++ b/Indoor.cpp	Fri Oct 25 11:13:15 2013 -0700
@@ -3274,12 +3274,12 @@
       if ( v0->uCurrentActionAnimation == ANIM_Walking)
       {
         v6 = v0->uMovementSpeed;
-        v7 = HIDWORD(v0->pActorBuffs[7].uExpireTime) == 0;
-        v8 = SHIDWORD(v0->pActorBuffs[7].uExpireTime) < 0;
+        v7 = HIDWORD(v0->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime) == 0;
+        v8 = SHIDWORD(v0->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime) < 0;
         v61 = v0->uMovementSpeed;
-        if ( !v8 && (!(v8 | v7) || LODWORD(v0->pActorBuffs[7].uExpireTime)) )
+        if ( !v8 && (!(v8 | v7) || LODWORD(v0->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime)) )
         {
-          v9 = v0->pActorBuffs[7].uPower;
+          v9 = v0->pActorBuffs[ACTOR_BUFF_SLOWED].uPower;
           if ( v9 )
             LODWORD(v10) = v6 / (unsigned __int16)v9;
           else
--- a/TurnEngine.cpp	Fri Oct 25 11:12:18 2013 -0700
+++ b/TurnEngine.cpp	Fri Oct 25 11:13:15 2013 -0700
@@ -658,7 +658,7 @@
                 monster_ai_state == AIState::Fidgeting)
                 {
                 pQueue[i].actor_initiative = pMonsterStats->pInfos[monster->pMonsterInfo.uID].uRecoveryTime;
-                if (monster->pActorBuffs[7].uExpireTime > 0)
+                if (monster->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0)
                     pQueue[i].actor_initiative*=2;
                 }
             }
--- a/mm7_3.cpp	Fri Oct 25 11:12:18 2013 -0700
+++ b/mm7_3.cpp	Fri Oct 25 11:13:15 2013 -0700
@@ -979,7 +979,7 @@
     if ( v0->uCurrentActionAnimation == ANIM_Walking )
     {
       v8 = v0->uMovementSpeed;
-      if ( (signed __int64)v0->pActorBuffs[7].uExpireTime > 0 )
+      if ( (signed __int64)v0->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
       {
         v8 = (signed __int64)((double)v8 * 0.5);
       }