Mercurial > mm7

changeset 1955:0c5326e2044a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[11] to pActorBuffs[ACTOR_BUFF_FATE]
author Grumpy7
date Fri, 25 Oct 2013 11:16:52 -0700
parents 730166317ed0
children 542c13cd72e2
files Actor.cpp CastSpellInfo.cpp mm7_6.cpp
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:15:57 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:16:52 2013 -0700
@@ -524,7 +524,7 @@
         v48 = 2 * (3 * realPoints + 60);
       else
         v48 = 0;
-      actorPtr->pActorBuffs[11].Apply(pParty->uTimePlayed + 1280, masteryLevel, v48, 0, 0);
+      actorPtr->pActorBuffs[ACTOR_BUFF_FATE].Apply(pParty->uTimePlayed + 1280, masteryLevel, v48, 0, 0);
       pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr,0xC8C805u);
       pAudioPlayer->PlaySound((SoundID)14020, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
       return;
--- a/CastSpellInfo.cpp	Fri Oct 25 11:15:57 2013 -0700
+++ b/CastSpellInfo.cpp	Fri Oct 25 11:16:52 2013 -0700
@@ -2309,7 +2309,7 @@
 				v343 = PID_ID(v342);
 				HIDWORD(v344) = 0 + ((pParty->uTimePlayed + 1280) >> 32);
 				LODWORD(v344) = LODWORD(pParty->uTimePlayed) + 1280;
-				pActors[v343].pActorBuffs[11].Apply(v344, v731, amount, 0, 0);
+				pActors[v343].pActorBuffs[ACTOR_BUFF_FATE].Apply(v344, v731, amount, 0, 0);
 				BYTE2(pActors[v343].uAttributes) |= 8u;
 				//v672 = 0;
 				v661 = &pActors[v343];
--- a/mm7_6.cpp	Fri Oct 25 11:15:57 2013 -0700
+++ b/mm7_6.cpp	Fri Oct 25 11:16:52 2013 -0700
@@ -355,12 +355,12 @@
 		}
 	case 47:
 		{
-		if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) < 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) < 0 )
 			return 1;
-		if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) > 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) > 0 )
 			return 0;
 		v3 = 0;
-		v4 = LODWORD(pActor->pActorBuffs[11].uExpireTime) == 0;
+		v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) == 0;
 		break;
 		}
 	case 51:
@@ -475,10 +475,10 @@
     a2a = pActor->pActorBuffs[14].uPower;
   if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > a2a )
     a2a = pActor->pActorBuffs[17].uPower;
-  if ( (signed __int64)pActor->pActorBuffs[11].uExpireTime > 0 )
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
   {
-    a2a += pActor->pActorBuffs[11].uPower;
-    pActor->pActorBuffs[11].Reset();
+    a2a += pActor->pActorBuffs[ACTOR_BUFF_FATE].uPower;
+    pActor->pActorBuffs[ACTOR_BUFF_FATE].Reset();
   }
   return rand() % (v10 + 2 * pActor->pMonsterInfo.uLevel + 10) + a2a + 1 > v10 + 5;
 }
@@ -495,10 +495,10 @@
     v3 = pActor->pActorBuffs[14].uPower;
   if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > v3 )
     v3 = pActor->pActorBuffs[17].uPower;
-  if ( (signed __int64)pActor->pActorBuffs[11].uExpireTime > 0 )
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
   {
-    v3 += pActor->pActorBuffs[11].uPower;
-    pActor->pActorBuffs[11].Reset();
+    v3 += pActor->pActorBuffs[ACTOR_BUFF_FATE].uPower;
+    pActor->pActorBuffs[ACTOR_BUFF_FATE].Reset();
   }
   v4 = pPlayer->GetActualAC() + 2 * pActor->pMonsterInfo.uLevel + 10;
   v5 = rand() % v4 + 1;