diff mm7_4.cpp @ 490:cc4b7981c1bb

Wands
author Nomad
date Wed, 27 Feb 2013 23:13:02 +0200
parents c92dd0242fb6
children 59649750a054
line wrap: on
line diff
--- a/mm7_4.cpp	Wed Feb 27 22:16:48 2013 +0200
+++ b/mm7_4.cpp	Wed Feb 27 23:13:02 2013 +0200
@@ -12663,7 +12663,7 @@
   DDM_DLV_Header *v26; // edi@29
   int v27; // eax@31
   int v28; // eax@32
-  unsigned int v29; // ecx@34
+  //unsigned int v29; // ecx@34
   unsigned int v30; // edx@36
   unsigned int v31; // edx@38
   unsigned int v32; // edx@40
@@ -12817,6 +12817,8 @@
         }
         return result;
       }
+
+      // DONATION
       //v24 = p2DEvents_minus1__20[13 * (unsigned int)ptr_507BC0->ptr_1C];
       v24 = p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier;
       v25 = 0;
@@ -12835,51 +12837,45 @@
           if ( v28 < -5 )
             v26->uReputation = -5;
         }
-        v29 = uActiveCharacter;
         if ( (unsigned __int8)byte_F8B1EF[uActiveCharacter] == pParty->uDaysPlayed % 7 )
         {
           if ( v26->uReputation <= -5 )
           {
             v30 = pParty->uDaysPlayed % 7 + 1;
             LOBYTE(v30) = v30 | 0x80;
-            _42777D_CastSpell_UseWand_ShootArrow(12, uActiveCharacter - 1, v30, 48, 0);
-            v29 = uActiveCharacter;
+            _42777D_CastSpell_UseWand_ShootArrow(SPELL_AIR_WIZARD_EYE, uActiveCharacter - 1, v30, 48, 0);
           }
           if ( v26->uReputation <= -10 )
           {
             v31 = pParty->uDaysPlayed % 7 + 1;
             LOBYTE(v31) = v31 | 0x80;
-            _42777D_CastSpell_UseWand_ShootArrow(50, v29 - 1, v31, 48, 0);
-            v29 = uActiveCharacter;
+            _42777D_CastSpell_UseWand_ShootArrow(SPELL_SPIRIT_PRESERVATION, uActiveCharacter - 1, v31, 48, 0);
             v26 = v66;
           }
           if ( v26->uReputation <= -15 )
           {
             v32 = pParty->uDaysPlayed % 7 + 1;
             LOBYTE(v32) = v32 | 0x80;
-            _42777D_CastSpell_UseWand_ShootArrow(75, v29 - 1, v32, 48, 0);
-            v29 = uActiveCharacter;
+            _42777D_CastSpell_UseWand_ShootArrow(SPELL_BODY_PROTECTION_FROM_MAGIC, uActiveCharacter - 1, v32, 48, 0);
             v26 = v66;
           }
           if ( v26->uReputation <= -20 )
           {
             v33 = pParty->uDaysPlayed % 7 + 1;
             LOBYTE(v33) = v33 | 0x80;
-            _42777D_CastSpell_UseWand_ShootArrow(86, v29 - 1, v33, 48, 0);
-            v29 = uActiveCharacter;
+            _42777D_CastSpell_UseWand_ShootArrow(SPELL_LIGHT_HOUR_OF_POWER, uActiveCharacter - 1, v33, 48, 0);
             v26 = v66;
           }
           if ( v26->uReputation <= -25 )
           {
             v34 = pParty->uDaysPlayed % 7 + 1;
             LOBYTE(v34) = v34 | 0x80;
-            _42777D_CastSpell_UseWand_ShootArrow(85, v29 - 1, v34, 48, 0);
-            v29 = uActiveCharacter;
-          }
-        }
-        ++byte_F8B1EF[v29];
+            _42777D_CastSpell_UseWand_ShootArrow(SPELL_LIGHT_DAY_OF_PROTECTION, uActiveCharacter - 1, v34, 48, 0);
+          }
+        }
+        ++byte_F8B1EF[uActiveCharacter];
         v1->PlaySound(SPEECH_83, 0);
-        ShowStatusBarString(pGlobalTXT_LocalizationStrings[527], 2u);
+        ShowStatusBarString(pGlobalTXT_LocalizationStrings[527], 2u); // "Thank You!"
         goto LABEL_46;
       }
       goto LABEL_55;