Mercurial > mm7

changeset 1958:95095c2a5e19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[14] to pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER]
author Grumpy7
date Fri, 25 Oct 2013 11:19:01 -0700
parents 3d0c57c4fa83
children 4fbffad6e011
files Actor.cpp mm7_6.cpp
diffstat 2 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:18:10 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:19:01 2013 -0700
@@ -636,7 +636,7 @@
         v94 = 1200 * realPoints + 3840;
       else
         v94 = 0;
-      actorPtr->pActorBuffs[14].Apply(
+      actorPtr->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].Apply(
         pParty->uTimePlayed + (signed int)(signed __int64)((double)(v94 << 7) * 0.033333335),
         masteryLevel,
         realPoints + 5,
@@ -1427,8 +1427,8 @@
   switch( dmgSource )
   {
     case 0: 
-      if ( this->pActorBuffs[14].uExpireTime > 0 )
-        v2 = this->pActorBuffs[14].uPower;
+      if ( this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
+        v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
       if ( this->pActorBuffs[18].uExpireTime > 0 && this->pActorBuffs[18].uPower > v2 )
         v2 = this->pActorBuffs[18].uPower;
       if ( this->pActorBuffs[21].uExpireTime > 0 )
--- a/mm7_6.cpp	Fri Oct 25 11:18:10 2013 -0700
+++ b/mm7_6.cpp	Fri Oct 25 11:19:01 2013 -0700
@@ -286,12 +286,12 @@
 		}
 	case 86:
 		{
-        if ( SHIDWORD(pActor->pActorBuffs[14].uExpireTime) < 0 )
+        if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime) < 0 )
 			return 1;
-        if ( SHIDWORD(pActor->pActorBuffs[14].uExpireTime) > 0 )
+        if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime) > 0 )
 			return 0;
         v3 = 0;
-        v4 = LODWORD(pActor->pActorBuffs[14].uExpireTime) == 0;
+        v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime) == 0;
 		break;
 		}
 	case 95:
@@ -406,7 +406,7 @@
   v6 = 0;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime > 0 )
     v5 /= 2;
-  if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 )
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
     v6 = pActor->pActorBuffs[15].uPower;
   if ( (signed __int64)pActor->pActorBuffs[16].uExpireTime > 0 && pActor->pActorBuffs[16].uPower > v6 )
     v6 = pActor->pActorBuffs[16].uPower;
@@ -466,13 +466,13 @@
   a2a = 0;
   if ( !v9 && (!(v9 | v8) || LODWORD(v5->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime) > 0) )
     v6 /= 2;
-  if ( (signed __int64)v5->pActorBuffs[14].uExpireTime > 0 )
-    v7 = v5->pActorBuffs[14].uPower;
+  if ( (signed __int64)v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
+    v7 = v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
   if ( (signed __int64)v5->pActorBuffs[16].uExpireTime > 0 && v5->pActorBuffs[16].uPower > v7 )
     v7 = v5->pActorBuffs[16].uPower;
   v10 = v7 + v6;
-  if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 )
-    a2a = pActor->pActorBuffs[14].uPower;
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
+    a2a = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
   if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > a2a )
     a2a = pActor->pActorBuffs[17].uPower;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
@@ -491,8 +491,8 @@
   int v5; // esi@8
 
   v3 = 0;
-  if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 )
-    v3 = pActor->pActorBuffs[14].uPower;
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
+    v3 = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
   if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > v3 )
     v3 = pActor->pActorBuffs[17].uPower;
   if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
@@ -535,8 +535,8 @@
 
   v4 = 0;
   v5 = 0;
-  if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 )
-    v5 = pActor->pActorBuffs[14].uPower;
+  if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
+    v5 = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
   switch ( a2 )
   {
     case 0: