Mercurial > hg > forks > multipaint-js

changeset 238:3a85cf4a4fef

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:23:17 +0300
parents a3f79ce74471
children f6565b8c3691
files draw_smart.pde
diffstat 1 files changed, 83 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/draw_smart.pde	Mon Sep 10 11:10:19 2018 +0300
+++ b/draw_smart.pde	Mon Sep 10 11:23:17 2018 +0300
@@ -317,7 +317,7 @@
 
 void fixattr(int x, int y, int foreg, int backg)
 {
-    int bad, cad, miny, maxy;
+    int miny, maxy;
 
     if (g_britemode == 1)
     {
@@ -337,8 +337,9 @@
 
     for (int i = miny; i <= maxy; i++)
     {
-        bad = 65536 + int(x / 8) + (y + i) * MX;
-        cad = bad + MX * (MY * 8);
+        int bad = 65536 + int(x / 8) + (y + i) * MX,
+            cad = bad + MX * (MY * 8);
+
         if (foreg >= 0)
         {
             g_map[bad] = byte(foreg);
@@ -365,10 +366,14 @@
 {
     int mx = int(x / 8);
     int my = int(y / 8);
-    if (g_control == false) return;
+
+    if (g_control == false)
+        return;
+
     int cc = easygetcolor(x, y);
-    mx = mx * 8;
-    my = my * 8;
+    mx *= 8;
+    my *= 8;
+
     for (int xx = 0; xx <= 7; xx++)
     {
         for (int yy = 0; yy <= 7; yy++)
@@ -516,17 +521,15 @@
                 }
 
                 for (int yy = 0; yy <= 7; yy++)
+                for (int xx = 0; xx <= 3; xx++)
                 {
-                    for (int xx = 0; xx <= 3; xx++)
+                    ad = 1024 + (mx * 8 + xx * 2) + (my * 8 + yy) * X;
+                    if (g_map[ad] == targetbit0 && g_map[ad + 1] == targetbit1)
                     {
-                        ad = 1024 + (mx * 8 + xx * 2) + (my * 8 + yy) * X;
-                        if (g_map[ad] == targetbit0 && g_map[ad + 1] == targetbit1)
+                        if (b0 >= 0)
                         {
-                            if (b0 >= 0)
-                            {
-                                g_map[ad] = byte(b0);
-                                g_map[ad + 1] = byte(b1);
-                            }
+                            g_map[ad] = byte(b0);
+                            g_map[ad + 1] = byte(b1);
                         }
                     }
                 }
@@ -554,95 +557,93 @@
         //color redundancy check
 
         for (int yy = 0; yy <= 7; yy++)
+        for (int xx = 0; xx <= 3; xx++)
         {
-            for (int xx = 0; xx <= 3; xx++)
+            ad = 1024 + (mx * 8 + xx * 2) + (my * 8 + yy) * X;
+
+            if (g_machine == C64M)
             {
-                ad = 1024 + (mx * 8 + xx * 2) + (my * 8 + yy) * X;
-
-                if (g_machine == C64M)
+                if (g_map[cad] == g_map[cad + 2000])
                 {
-                    if (g_map[cad] == g_map[cad + 2000])
-                    {
-                        if (g_map[ad] == 1 && g_map[ad + 1] == 1)
-                        {
-                            g_map[ad] = 1;
-                            g_map[ad + 1] = 0;
-                        }
-                    }
-                    if (g_map[cad + 1000] == g_map[cad + 2000])
-                    {
-                        if (g_map[ad] == 1 && g_map[ad + 1] == 1)
-                        {
-                            g_map[ad] = 0;
-                            g_map[ad + 1] = 1;
-                        }
-                    }
-                }
-
-                if (g_map[cad] == g_map[cad + 1000])
-                {
-                    if (g_map[ad] == 0 && g_map[ad + 1] == 1)
+                    if (g_map[ad] == 1 && g_map[ad + 1] == 1)
                     {
                         g_map[ad] = 1;
                         g_map[ad + 1] = 0;
                     }
                 }
-                if (g_map[1] == g_map[cad])
+                if (g_map[cad + 1000] == g_map[cad + 2000])
+                {
+                    if (g_map[ad] == 1 && g_map[ad + 1] == 1)
+                    {
+                        g_map[ad] = 0;
+                        g_map[ad + 1] = 1;
+                    }
+                }
+            }
+
+            if (g_map[cad] == g_map[cad + 1000])
+            {
+                if (g_map[ad] == 0 && g_map[ad + 1] == 1)
+                {
+                    g_map[ad] = 1;
+                    g_map[ad + 1] = 0;
+                }
+            }
+            if (g_map[1] == g_map[cad])
+            {
+                if (g_map[ad] == 1 && g_map[ad + 1] == 0)
+                {
+                    g_map[ad] = 0;
+                    g_map[ad + 1] = 0;
+                }
+            }
+            if (g_map[1] == g_map[cad + 1000])
+            {
+                if (g_map[ad] == 0 && g_map[ad + 1] == 1)
+                {
+                    g_map[ad] = 0;
+                    g_map[ad + 1] = 0;
+                }
+            }
+
+            if (g_machine == PLUS4M)
+            {
+                if (g_map[2] == g_map[cad])
                 {
                     if (g_map[ad] == 1 && g_map[ad + 1] == 0)
                     {
+                        g_map[ad] = 1;
+                        g_map[ad + 1] = 1;
+                    }
+                }
+                if (g_map[2] == g_map[cad + 1000])
+                {
+                    if (g_map[ad] == 0 && g_map[ad + 1] == 1)
+                    {
+                        g_map[ad] = 1;
+                        g_map[ad + 1] = 1;
+                    }
+                }
+                if (g_map[1] == g_map[2])
+                {
+                    if (g_map[ad] == 1 && g_map[ad + 1] == 1)
+                    {
                         g_map[ad] = 0;
                         g_map[ad + 1] = 0;
                     }
                 }
-                if (g_map[1] == g_map[cad + 1000])
+            }
+
+            if (g_machine == C64M)
+            {
+                if (g_map[1] == g_map[cad + 2000])
                 {
-                    if (g_map[ad] == 0 && g_map[ad + 1] == 1)
+                    if (g_map[ad] == 1 && g_map[ad + 1] == 1)
                     {
                         g_map[ad] = 0;
                         g_map[ad + 1] = 0;
                     }
                 }
-
-                if (g_machine == PLUS4M)
-                {
-                    if (g_map[2] == g_map[cad])
-                    {
-                        if (g_map[ad] == 1 && g_map[ad + 1] == 0)
-                        {
-                            g_map[ad] = 1;
-                            g_map[ad + 1] = 1;
-                        }
-                    }
-                    if (g_map[2] == g_map[cad + 1000])
-                    {
-                        if (g_map[ad] == 0 && g_map[ad + 1] == 1)
-                        {
-                            g_map[ad] = 1;
-                            g_map[ad + 1] = 1;
-                        }
-                    }
-                    if (g_map[1] == g_map[2])
-                    {
-                        if (g_map[ad] == 1 && g_map[ad + 1] == 1)
-                        {
-                            g_map[ad] = 0;
-                            g_map[ad + 1] = 0;
-                        }
-                    }
-                }
-
-                if (g_machine == C64M)
-                {
-                    if (g_map[1] == g_map[cad + 2000])
-                    {
-                        if (g_map[ad] == 1 && g_map[ad + 1] == 1)
-                        {
-                            g_map[ad] = 0;
-                            g_map[ad + 1] = 0;
-                        }
-                    }
-                }
             }
         }
     }