# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1534251015 -10800
# Node ID d7c13f42717869a175faa23ad41a163f85308ab4
# Parent  aca95d4a8e6bd0cc2ee5e1b7a576420f5b369ab9
Cleanups.

diff -r aca95d4a8e6b -r d7c13f427178 draw_inputs.pde
--- a/draw_inputs.pde	Tue Aug 14 14:58:32 2018 +0300
+++ b/draw_inputs.pde	Tue Aug 14 15:50:15 2018 +0300
@@ -199,7 +199,7 @@
         if (mode == 0) {
             val = g_map[ad + (MX * MY) * 8];
         } else {
-            val = g_brush[ad + (MX * MY) * 8];;
+            val = g_brush[ad + (MX * MY) * 8];
         }
         if (g_britemode == 1 && val == 8) return 0;
         return val;
diff -r aca95d4a8e6b -r d7c13f427178 draw_outputs.pde
--- a/draw_outputs.pde	Tue Aug 14 14:58:32 2018 +0300
+++ b/draw_outputs.pde	Tue Aug 14 15:50:15 2018 +0300
@@ -123,8 +123,7 @@
                 midx = chopv(midx, g_gridx);
             }
         }
-        int orient;
-        orient = g_data[int('x')] * 100 + g_data[int('y')] * 10 + g_data[int('q')];
+        int orient = g_data[int('x')] * 100 + g_data[int('y')] * 10 + g_data[int('q')];
         if (g_pixelw == 2) {
             x = chop2(x);
             passes = 1;
@@ -199,7 +198,6 @@
                         }
 
                         if (mb == RIGHT) {
-
                             if (g_multic > 0) {
                                 if (g_pixelw == 2) {
                                     if (g_data[int('q')] == 0) clearpoint(x0, y0);
@@ -253,7 +251,7 @@
 }
 
 
-void doline(int xfrom, int yfrom, int xto, int yto, int prevent)
+void do_line(int xfrom, int yfrom, int xto, int yto, int prevent)
 {
     //bresenham almost exactly from Wikipedia
     int swap, pex, pey;
@@ -337,7 +335,7 @@
     }
 }
 
-void docircle_new(int x1, int y1, int x2, int y2)
+void do_circle_new(int x1, int y1, int x2, int y2)
 {
     int hh, vv;
     float prop;
@@ -368,7 +366,7 @@
 }
 
 
-void docircle(int x1, int y1, int x2, int y2)
+void do_circle(int x1, int y1, int x2, int y2)
 {
     float dds, a, t, sx, sy, gear1, gear2, x0, y0;
     int prex, prey;
@@ -400,14 +398,14 @@
         a = t / (gear1) * PI;
         sx = (x2 - x1) * sin(a);
         sy = (y1 - y2) * cos(a);
-        if (t > 0) doline(prex, prey, x1 + int(sx), y1 + int(sy), 1);
+        if (t > 0) do_line(prex, prey, x1 + int(sx), y1 + int(sy), 1);
         prex = (x1 + int(sx));
         prey = (y1 + int(sy));
     }
 }
 
 
-void rectangle(int x1, int y1, int x2, int y2)
+void do_rectangle(int x1, int y1, int x2, int y2)
 {
     int x0, y0, yt, xt, xf, yf;
 
@@ -475,10 +473,10 @@
                 if (g_bsize == 3) y2++;
             }
         }
-        doline(x1, y1, x2, y1, 0);
-        doline(x1, y1, x1, y2, 0);
-        doline(x1, y2, x2, y2, 0);
-        doline(x2, y2, x2, y1, 0);
+        do_line(x1, y1, x2, y1, 0);
+        do_line(x1, y1, x1, y2, 0);
+        do_line(x1, y2, x2, y2, 0);
+        do_line(x2, y2, x2, y1, 0);
     }
     g_farge = g_ofarge;
 }
@@ -1111,7 +1109,7 @@
             g_prey = y;
             craft(x, y, 0);
         }
-        doline(x, y, g_prex, g_prey, 0);
+        do_line(x, y, g_prex, g_prey, 0);
         g_prex = x;
         g_prey = y;
     }
diff -r aca95d4a8e6b -r d7c13f427178 events.pde
--- a/events.pde	Tue Aug 14 14:58:32 2018 +0300
+++ b/events.pde	Tue Aug 14 15:50:15 2018 +0300
@@ -218,19 +218,19 @@
     if (tool() == 8) {
         if (g_phase == 1) {
             g_phase = 0;
-            rectangle(g_rx, g_ry, g_rx2, g_ry2);
+            do_rectangle(g_rx, g_ry, g_rx2, g_ry2);
         }
     }
     if (tool() == 7) { //circle
         if (g_phase == 1) {
             g_phase = 0;
-            docircle(g_rx, g_ry, g_rx2, g_ry2);
+            do_circle(g_rx, g_ry, g_rx2, g_ry2);
         }
     }
     if (tool() == 6) {
         if (g_phase == 1) {
             g_phase = 0;
-            doline(g_rx, g_ry, g_rx2, g_ry2, 0);
+            do_line(g_rx, g_ry, g_rx2, g_ry2, 0);
         }
     }
 
diff -r aca95d4a8e6b -r d7c13f427178 multipaint.pde
--- a/multipaint.pde	Tue Aug 14 14:58:32 2018 +0300
+++ b/multipaint.pde	Tue Aug 14 15:50:15 2018 +0300
@@ -207,16 +207,18 @@
     g_multic = 0;
     g_repanel = -2;
 
-    //UI colors
+    // UI colors
     makecolor(256, 0xff, 0, 0xff);
     makecolor(257, 180, 180, 180);
     g_rgb[257] = 0xff808080;
     makecolor(258, 0, 0, 0);
     makecolor(259, 48, 48, 48);
-    //R,G,B
+
+    // R,G and B for the palette sliders
     makecolor(260, 255, 0, 0);
     makecolor(261, 0, 255, 0);
     makecolor(262, 0, 0, 255);
+    makecolor(263, 48, 48, 48); //backest UI background
 
     mpSetupMachine(machine);
     g_windowx = width - (g_hedge) - (g_wzoom * X);
@@ -239,7 +241,7 @@
 
     switcher(2);
     noStroke();
-    background(g_r[259], g_g[259], g_b[259]);
+    background(g_r[263], g_g[263], g_b[263]);
     sussborder();
     setup_raster();
 
@@ -540,9 +542,9 @@
     else
         storecoords(g_mx, g_my);
 
-    if (tool() == 6) doline(g_rx, g_ry, g_rx2, g_ry2, 0);
-    if (tool() == 7) docircle(g_rx, g_ry, g_rx2, g_ry2);
-    if (tool() == 8) rectangle(g_rx, g_ry, g_rx2, g_ry2);
+    if (tool() == 6) do_line(g_rx, g_ry, g_rx2, g_ry2, 0);
+    if (tool() == 7) do_circle(g_rx, g_ry, g_rx2, g_ry2);
+    if (tool() == 8) do_rectangle(g_rx, g_ry, g_rx2, g_ry2);
     g_button = savebut;
 
     // Screen update stuff