Mercurial > mm7

changeset 1855:51e9b4621d0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Actor::AI_SpellAttack preparing to remove label 159
author Grumpy7
date Mon, 14 Oct 2013 00:40:25 +0200
parents a02d72dd7653
children 656962b05d32
files Actor.cpp
diffstat 1 files changed, 23 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Mon Oct 14 00:24:57 2013 +0200
+++ b/Actor.cpp	Mon Oct 14 00:40:25 2013 +0200
@@ -320,6 +320,27 @@
   signed int a1b; // [sp+E0h] [bp+10h]@145
   int a1c; // [sp+E0h] [bp+10h]@184
 
+
+
+  if ( uSpellID == 6 )
+    goto LABEL_159;
+  if ( uSpellID == 11 )
+    goto LABEL_159;
+  if ( uSpellID == 18 || uSpellID == 2 )
+    goto LABEL_159;
+  if ( uSpellID == 26 || uSpellID == 29 )
+    goto LABEL_159;
+  if ( uSpellID == 39 || uSpellID == 41 )
+    goto LABEL_159;
+  if ( uSpellID == 57 || uSpellID == 65 || uSpellID == 70 )
+    goto LABEL_159;
+  if ( uSpellID == 78 )
+    goto LABEL_159;
+  if ( uSpellID == 90 )
+    goto LABEL_159;
+  if ( uSpellID == 97 )
+    goto LABEL_159;
+
   LODWORD(v120) = uActorID;
   v5 = &pActors[uActorID];
   v117 = pDir;
@@ -331,12 +352,8 @@
     {
       if ( uSpellID <= 18 )
       {
-        if ( uSpellID == 18 || uSpellID == 2 )
-          goto LABEL_159;
         if ( uSpellID != 5 )
         {
-          if ( uSpellID == 6 )
-            goto LABEL_159;
           if ( uSpellID != 9 )
           {
             if ( uSpellID != 11 )
@@ -639,12 +656,8 @@
         pAudioPlayer->PlaySound(v98, v99, 0, -1, 0, 0, 0, 0);
         return;
       }
-      if ( uSpellID == 26 || uSpellID == 29 )
-        goto LABEL_159;
       if ( uSpellID != 38 )
       {
-        if ( uSpellID == 39 || uSpellID == 41 )
-          goto LABEL_159;
         if ( uSpellID != 46 )
           return;
 
@@ -776,8 +789,6 @@
     }
     if ( uSpellID != 51 )
     {
-      if ( uSpellID == 57 || uSpellID == 65 || uSpellID == 70 )
-        goto LABEL_159;
       if ( uSpellID == 73 )
       {
         if ( (signed int)masteryLevel <= 0 || (signed int)masteryLevel > 4 )
@@ -811,9 +822,7 @@
         pAudioPlayer->PlaySound(v98, v99, 0, -1, 0, 0, 0, 0);
         return;
       }
-      if ( uSpellID != 78 )
-        return;
-      goto LABEL_159;
+      return;
     }
     if (masteryLevel == 0)
     {
@@ -918,15 +927,11 @@
     pAudioPlayer->PlaySound(v98, v99, 0, -1, 0, 0, 0, 0);
     return;
   }
-  if ( uSpellID == 90 )
-    goto LABEL_159;
   if ( uSpellID != 93 )
   {
     if ( uSpellID != 95 )
     {
-      if ( uSpellID != 97 )
-        return;
-      goto LABEL_159;
+      return;
     }
     if (masteryLevel == 0)
       v68 = 0;