# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1531438887 -10800
# Node ID 146879c896b9ad87810fc17cbd89a005ec18a795
# Parent  3f48c23c7987cf3945ae446cbefa967b03ff6263
Cleanups.

diff -r 3f48c23c7987 -r 146879c896b9 exporters.pde
--- a/exporters.pde	Fri Jul 13 01:06:18 2018 +0300
+++ b/exporters.pde	Fri Jul 13 02:41:27 2018 +0300
@@ -76,7 +76,7 @@
             dval >>= 4;
         }
 
-        return new String(dstr.join(''));
+        return dstr.join('');
     }
 
     String getByteStr(int val)
@@ -163,7 +163,7 @@
             if (m_state != 2)
                 addByteDef(true);
             else
-            if (m_bpl > 0 && m_bytes > m_bpl)
+            if (m_bpl > 0 && m_bytes >= m_bpl)
                 addByteDef(true);
 
             if (m_bytes++ > 0)
@@ -834,7 +834,7 @@
 }
 
 
-void mpExportBitmapData_CPC(MPWriteCtx ctx, int xwid, int yy)
+void mpExportBitmapData_CPC(MPWriteCtx ctx, int mwidth, int mheight)
 {
     int x, y, ad, val1, val2, y2;
     int pix0b0, pix0b1, pix0b2, pix0b3;
@@ -846,8 +846,8 @@
     {
         ctx.addByteDef(true);
 
-        for (y = 0; y < 25; y++)
-        for (x = 0; x < int(xwid / 2); x++)
+        for (y = 0; y < int(mheight / 8); y++)
+        for (x = 0; x < int(mwidth / 2); x++)
         {
             ad = 1024 + (y * 8) * X + (y2 * X) + x * 4;
 
@@ -881,39 +881,38 @@
         for (int j = 0; j <= 47; j++)
             ctx.writeByte(0);
     }
+
     ctx.setBPLOff();
     ctx.addEOL();
 }
 
 
-void mpExportBitmapData(MPWriteCtx ctx, int xx, int yy)
+void mpExportBitmapData(MPWriteCtx ctx, int mwidth, int mheight)
 {
-    int linep = 0,
-        xwid  = xx * 8,
-        ywid = yy * 8;
+    int xwid = mwidth * 8,
+        ywid = mheight * 8;
 
     ctx.setBPL(32);
     ctx.addByteDef(true);
 
-    for (int y = 0; y < yy; y++)
-    for (int x = 0; x < xx; x++)
+    for (int y = 0; y < mheight; y++)
+    for (int x = 0; x < mwidth; x++)
+    for (int y2 = 0; y2 < 8; y2++)
     {
-        for (int y2 = 0; y2 < 8; y2++)
-        {
-            int ad = 1024 + y * (xwid * 8) + (y2 * xwid) + x * 8;
-            int value =
-                g_map[ad + 0] * 128 +
-                g_map[ad + 1] * 64 +
-                g_map[ad + 2] * 32 +
-                g_map[ad + 3] * 16 +
-                g_map[ad + 4] * 8 +
-                g_map[ad + 5] * 4 +
-                g_map[ad + 6] * 2 +
-                g_map[ad + 7] * 1;
+        int ad = 1024 + y * (xwid * 8) + (y2 * xwid) + x * 8;
+        int value =
+            g_map[ad + 0] * 128 +
+            g_map[ad + 1] * 64 +
+            g_map[ad + 2] * 32 +
+            g_map[ad + 3] * 16 +
+            g_map[ad + 4] * 8 +
+            g_map[ad + 5] * 4 +
+            g_map[ad + 6] * 2 +
+            g_map[ad + 7] * 1;
 
-            ctx.writeByte(value);
-        }
+        ctx.writeByte(value);
     }
+
     ctx.setBPLOff();
     ctx.addEOL();
 }