Mercurial > mm7

diff mm7_5.cpp @ 1519:4c787c28ddce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean CastSpellInfo. (2)
author yoctozepto
date Wed, 04 Sep 2013 16:00:15 +0200
parents c3da3c2985b8
children d023247ae118
line wrap: on
line diff
--- a/mm7_5.cpp	Wed Sep 04 15:27:01 2013 +0200
+++ b/mm7_5.cpp	Wed Sep 04 16:00:15 2013 +0200
@@ -1792,7 +1792,7 @@
             if ( !v47 )
               continue;
             pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
-            LOBYTE(pSpellInfo->field_8) &= 0xBFu;
+            pSpellInfo->uFlags &= ~0x40u;
             pSpellInfo->uPlayerID_2 = uMessageParam;
             pSpellInfo->spell_target_pid = v44;
             pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
@@ -1810,7 +1810,7 @@
             if ( !v47 )
               continue;
             pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
-            LOBYTE(pSpellInfo->field_8) &= 0xBFu;
+            pSpellInfo->uFlags &= ~0x40u;
             pSpellInfo->uPlayerID_2 = uMessageParam;
             pSpellInfo->spell_target_pid = v44;
             pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
@@ -1837,7 +1837,7 @@
                 continue;
               v44 = uNumSeconds;
               pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
-              LOBYTE(pSpellInfo->field_8) &= 0xBFu;
+              pSpellInfo->uFlags &= ~0x40u;
               pSpellInfo->uPlayerID_2 = uMessageParam;
               pSpellInfo->spell_target_pid = v44;
               pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
@@ -1857,7 +1857,7 @@
           if ( v48 )
             continue;
           pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
-          LOBYTE(pSpellInfo->field_8) &= 0xBFu;
+          pSpellInfo->uFlags &= ~0x40u;
           pSpellInfo->uPlayerID_2 = uMessageParam;
           pSpellInfo->spell_target_pid = v44;
           pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
@@ -1886,13 +1886,13 @@
               switch ( uMessage )
               {
                 case UIMSG_CastSpell_Character_Big_Improvement:
-                  LOBYTE(pSpellInfo->field_8) &= 0xFDu;
+                  pSpellInfo->uFlags &= ~0x02u;
                   break;
                 case UIMSG_CastSpell_Character_Small_Improvement:
-                  HIBYTE(pSpellInfo->field_8) &= 0xFEu;
+                  pSpellInfo->uFlags &= ~0x0100u;
                   break;
                 case UIMSG_HiredNPC_CastSpell:
-                  HIBYTE(pSpellInfo->field_8) &= 0xFDu;
+                  pSpellInfo->uFlags &= ~0x0200u;
                   break;
               }
               pSpellInfo->uPlayerID_2 = uMessageParam;
@@ -2370,14 +2370,14 @@
           pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
           if ( uMessage == UIMSG_CastSpell_Shoot_Monster )
           {
-            LOBYTE(pSpellInfo->field_8) &= 0xF7;
+            pSpellInfo->uFlags &= ~0x08;
           }
           else
           {
             if ( uMessage == UIMSG_CastSpell_Monster_Improvement )
-              HIBYTE(pSpellInfo->field_8) &= 0xFEu;
+              pSpellInfo->uFlags &= ~0x0100u;
             else
-              HIBYTE(pSpellInfo->field_8) &= 0xFDu;
+              pSpellInfo->uFlags &= ~0x0200u;
           }
           pSpellInfo->uPlayerID_2 = uMessageParam;
           pSpellInfo->spell_target_pid = v44;