Mercurial > mm7

changeset 1928:4fa815c2112d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DamageMonsterFromParty removed LABEL_67
author Grumpy7
date Tue, 22 Oct 2013 23:18:41 -0700
parents 50d00b884765
children 4cce1e24b7e7
files Actor.cpp
diffstat 1 files changed, 32 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Tue Oct 22 19:09:12 2013 -0700
+++ b/Actor.cpp	Tue Oct 22 23:18:41 2013 -0700
@@ -3701,7 +3701,12 @@
     //v27 = player->CalculateMeleeDamageTo(0, 0, v50);
     uDamageAmount = player->CalculateMeleeDamageTo(false, false, v50);
     //if ( !v57 )
-      goto LABEL_67;
+    if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
+    {
+      player->PlaySound(SPEECH_52, 0);
+      return;
+    }
+    goto LABEL_69;
     //goto LABEL_69;
   }
 
@@ -3762,7 +3767,12 @@
       a4 = player->pActiveSkills[7] & 0x3F;
     a2 = 4;
     uDamageAmount = player->CalculateMeleeDamageTo(true, true, 0);
-    goto LABEL_67;
+    if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
+    {
+      player->PlaySound(SPEECH_52, 0);
+      return;
+    }
+    goto LABEL_69;
   }
   if ( v15 != SPELL_BOW_ARROW )
   {
@@ -3776,7 +3786,12 @@
       if ( !v20 && (!(v20 | v19) || LODWORD(pMonster->pActorBuffs[15].uExpireTime)) )
         uDamageAmount >>= 1;
       v59 = 1;
-      goto LABEL_67;
+      if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
+      {
+        player->PlaySound(SPEECH_52, 0);
+        return;
+      }
+      goto LABEL_69;
     }
     if ( v15 == SPELL_EARTH_BLADES )
     {
@@ -3795,7 +3810,6 @@
 LABEL_67:
       if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
       {
-//LABEL_68:
         player->PlaySound(SPEECH_52, 0);
         return;
       }
@@ -3806,7 +3820,12 @@
       uDamageAmount = 0;
       a2 = 4;
       hit_will_stun = 1;
-      goto LABEL_67;
+      if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
+      {
+        player->PlaySound(SPEECH_52, 0);
+        return;
+      }
+      goto LABEL_69;
     }
     a2 = player->GetSpellSchool(v4->spell_id);
     v25 = v4->spell_level;
@@ -3839,7 +3858,14 @@
   v59 = 1;
 //LABEL_66:
   if ( !v57 )
-    goto LABEL_67;
+  {
+    if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
+    {
+      player->PlaySound(SPEECH_52, 0);
+      return;
+    }
+    goto LABEL_69;
+  }
 LABEL_69:
   if (player->IsWeak())
     uDamageAmount /= 1;