Mercurial > hg > forks > multipaint-js

changeset 237:a3f79ce74471

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 10 Sep 2018 11:10:19 +0300
parents 69b031cc8064
children 3a85cf4a4fef
files draw_smart.pde
diffstat 1 files changed, 27 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/draw_smart.pde	Mon Sep 10 08:10:11 2018 +0300
+++ b/draw_smart.pde	Mon Sep 10 11:10:19 2018 +0300
@@ -3,8 +3,7 @@
 
 void consistency()
 {
-    int xx, yy, ad, a, b, x0, y0, x2, y2;
-    int pat, mat, fad, bad, maxxy, mulu, ymax;
+    int mat, mulu, ymax;
 
     if (g_multic == 1 || g_multic == 2)
         return;
@@ -13,41 +12,45 @@
     {
         mat = 8;
         mulu = 1;
-        maxxy = Y;
         ymax = 0;
     }
     else
     {
         mat = 64;
         mulu = 8;
-        maxxy = MY;
         ymax = 7;
     }
 
-    for (yy = 0; yy < MY; yy++)
-    for (xx = 0; xx < MX; xx++)
+    for (int yy = 0; yy < MY; yy++)
+    for (int xx = 0; xx < MX; xx++)
     {
-        a = getattra(xx * 8, yy * mulu, 0);
-        b = getattra(xx * 8, yy * mulu, 1);
-        if (a == b) {
-            for (y0 = 0; y0 <= ymax; y0++) {
-                for (x0 = 0; x0 <= 7; x0++) {
-                    ad = 1024 + (xx * 8) + (yy * X * mulu) + x0 + y0 * X;
-                    g_map[ad] = byte(0);
-                }
+        int a = getattra(xx * 8, yy * mulu, 0),
+            b = getattra(xx * 8, yy * mulu, 1),
+            ad = 1024 + (xx * 8) + (yy * mulu * X);
+
+        if (a == b)
+        {
+            for (int y0 = 0; y0 <= ymax; y0++)
+            for (int x0 = 0; x0 <= 7; x0++)
+            {
+                g_map[ad + x0 + y0 * X] = byte(0);
             }
         }
-        pat = 0;
-        for (y0 = 0; y0 <= ymax; y0++) {
-            for (x0 = 0; x0 <= 7; x0++) {
-                ad = 1024 + (xx * 8) + (yy * X * mulu) + x0 + y0 * X;
-                pat = pat + int(g_map[ad]);
-            }
+
+        int pat = 0;
+        for (int y0 = 0; y0 <= ymax; y0++)
+        for (int x0 = 0; x0 <= 7; x0++)
+        {
+            pat += int(g_map[ad + x0 + y0 * X]);
         }
-        if (pat == mat || pat == 0) {
-            for (y0 = 0; y0 <= ymax; y0++) {
-                fad = 65536 + xx + (yy * mulu + y0) * MX;
-                bad = fad + (MX * MY * 8);
+        
+        if (pat == mat || pat == 0)
+        {
+            for (y0 = 0; y0 <= ymax; y0++)
+            {
+                int fad = 65536 + xx + (yy * mulu + y0) * MX,
+                    bad = fad + (MX * MY * 8);
+
                 if (pat == 0) g_map[fad] = g_map[bad];
                 if (pat == mat) g_map[bad] = g_map[fad];
             }