# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1531154076 -10800
# Node ID 68e8d86c9eefa6c3c5d6fd1b8625cbdaf077932d
# Parent  f49f83b9bbc716ad6e556aaab8db389ff626b1fd
Get rid of unused variables and clean up the logic slightly in mpExportColorData()

diff -r f49f83b9bbc7 -r 68e8d86c9eef exporters.pde
--- a/exporters.pde	Mon Jul 09 18:52:27 2018 +0300
+++ b/exporters.pde	Mon Jul 09 19:34:36 2018 +0300
@@ -921,77 +921,72 @@
 }
 
 
-void mpExportColorData(MPWriteCtx ctx, int xx, int yy, int source, int param)
+void mpExportColorData(MPWriteCtx ctx, int width, int height, int srcoffs, int param)
 {
-    int valu, valu2, kalu, muista, ad, linep, xwid, ywid, xoor, yline, myrpsi;
-
-    xwid = xx * 8;
-    ywid = yy * 8;
+    int xmult, myrpsi;
 
     myrpsi = 0;
-    xoor = xx;
 
-    if (param == 0 || param == 4 || param == 5) {
-        xoor = xx * 8;
-    }
+    if (param == 0 || param == 3 || param == 4 || param == 5)
+        xmult = width * 8;
+    else
+        xmult = width;
+
     if (machine == MSX) {
         myrpsi = 7;
     }
-    if (param == 3) {
-        xoor = xx * 8;
-    }
 
-    for (int y = 0; y < yy; y++)
+    for (int yc = 0; yc < height; yc++)
     {
         ctx.byteDef();
-        for (int x = 0; x < xx; x++)
-        for (yline = 0; yline <= myrpsi; yline++)
+        for (int xc = 0; xc < width; xc++)
+        for (int yline = 0; yline <= myrpsi; yline++)
         {
-            ad = source + x + y * xoor + yline * xx;
+            int valu1, valu2, ad = srcoffs + xc + yc * xmult + yline * width;
 
             switch (param)
             {
                 case 0:
-                    valu = int(g_map[ad]);
+                    valu1 = int(g_map[ad]);
                     valu2 = int(g_map[ad + MX * MY * 8]);
                     break;
 
                 case 1:
                     valu2 = int(g_map[ad]);
-                    valu = int(g_map[ad + 1000]);
+                    valu1 = int(g_map[ad + 1000]);
                     break;
 
                 case 2:
                     valu2 = int(g_map[ad]);
-                    valu = 0;
+                    valu1 = 0;
                     break;
 
                 case 3:
-                    valu = int(g_map[ad]);
+                    valu1 = int(g_map[ad]);
                     valu2 = int(g_map[ad + MX * MY * 8]);
                     break;
 
                 case 4:
                     //plus4 colortable
-                    valu = getpluscolor(int(g_map[ad]));
+                    valu1 = getpluscolor(int(g_map[ad]));
                     valu2 = getpluscolor(int(g_map[ad + MX * MY * 8]));
                     break;
 
                 case 5:
                     //plus4 lumitable
-                    valu = getplusluminance(int(g_map[ad + MX * MY * 8]));
+                    valu1 = getplusluminance(int(g_map[ad + MX * MY * 8]));
                     valu2 = getplusluminance(int(g_map[ad]));
                     break;
 
                 case 6:
                     //plus4 multic1
                     valu2 = getpluscolor(int(g_map[ad]));
-                    valu = getpluscolor(int(g_map[ad + 1000]));
+                    valu1 = getpluscolor(int(g_map[ad + 1000]));
                     break;
 
                 case 7:
                     //plus4 multic2
-                    valu = getplusluminance(int(g_map[ad]));
+                    valu1 = getplusluminance(int(g_map[ad]));
                     valu2 = getplusluminance(int(g_map[ad + 1000]));
                     break;
 
@@ -999,7 +994,7 @@
                     return null;
             }
 
-            ctx.writeByte(valu * 16 + valu2);
+            ctx.writeByte(valu1 * 16 + valu2);
         }
         ctx.eol();
     }