Mercurial > mm7

diff mm7_6.cpp @ 349:672b83584b0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GetActorTintColor
author Nomad
date Thu, 21 Feb 2013 02:12:29 +0200
parents d720a13e2273
children 7f817679b60e
line wrap: on
line diff
--- a/mm7_6.cpp	Thu Feb 21 00:39:47 2013 +0200
+++ b/mm7_6.cpp	Thu Feb 21 02:12:29 2013 +0200
@@ -7686,11 +7686,11 @@
         v640 = v12 - 2;
         if ( !v640 || (v641 = v640 - 1) == 0 || (amount = 4, v641 != 1) )
           amount = 3;
-        if ( pPlayer->uNumArmageddonCasts >= amount || pParty->field_1613C > v1 )
+        if ( pPlayer->uNumArmageddonCasts >= amount || pParty->armageddon_timer > v1 )
           goto LABEL_200;
         if ( !pPlayer->CanCastSpell(uRequiredMana) )
           goto LABEL_83;
-        pParty->field_1613C = 256;
+        pParty->armageddon_timer = 256;
         pParty->field_16140 = v2;
         ++pPlayer->uNumArmageddonCasts;
         if ( pParty->bTurnBasedModeOn == 1 )