diff mm7_3.cpp @ 1908:cb1cbb969fce

Merge
author Grumpy7
date Mon, 21 Oct 2013 23:20:29 -0700
parents 4cae2d58cfb4
children 8d3723ca71e6 af38275939cc
line wrap: on
line diff
--- a/mm7_3.cpp	Mon Oct 21 23:19:30 2013 -0700
+++ b/mm7_3.cpp	Mon Oct 21 23:20:29 2013 -0700
@@ -5314,7 +5314,10 @@
       v20 = pParty->pPartyBuffs[PARTY_BUFF_TORCHLIGHT].uPower;
     v9 = (double)v20 * 1024.0;
     if ( a4 )
-      goto LABEL_19;
+    {
+      v6 = 216;
+      goto LABEL_20;
+    }
     if ( distance <= v9 )
     {
       if ( distance > 0.0 )
@@ -5324,7 +5327,10 @@
         //v6 = LODWORD(v10);
         v6 = floorf(0.5f + distance * 216.0 / v9);
         if (v6 > 216 )
-          goto LABEL_19;
+        {
+          v6 = 216;
+          goto LABEL_20;
+        }
       }
     }
     else
@@ -5340,7 +5346,7 @@
         v6 = 216;
       return (255 - v6) | ((255 - v6) << 16) | ((255 - v6) << 8);
     }
-LABEL_19:
+//LABEL_19:
     v6 = 216;
     goto LABEL_20;
   }