# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1530824323 -10800
# Node ID 6e5b619861c856b7a4e4786b2cd0436417d2421e
# Parent  db97aef4e1595d9af4f02ff571c33c28034f2bd0
Rename two more functions.

diff -r db97aef4e159 -r 6e5b619861c8 exporters.pde
--- a/exporters.pde	Thu Jul 05 23:55:18 2018 +0300
+++ b/exporters.pde	Thu Jul 05 23:58:43 2018 +0300
@@ -265,7 +265,7 @@
         mpSetDataOffs(1026);
         mpExportColorData(40, 25, 65536, 4); //colors
         mpSetDataOffs(2050);
-        bitmapexport(40, 25);
+        mpExportBitmapData(40, 25);
         export_program(fname);
     }
     else
@@ -286,14 +286,14 @@
         mpSetDataOffs(2);
         mpExportColorData(40, 25, 65536, 7); //lumis
         mpSetDataOffs(2050);
-        bitmapexport(40, 25);
+        mpExportBitmapData(40, 25);
         export_program(fname);
     }
     else
     if (machine == C64) {
         mpLoadTemplate("hires.art");
         mpSetDataOffs(2);
-        bitmapexport(40, 25);
+        mpExportBitmapData(40, 25);
         mpSetDataOffs(0x1f42);
         mpExportColorData(40, 25, 65536, 0);
         mpSetDataOffs(0x232a);
@@ -307,7 +307,7 @@
             // Koala Painter
             mpLoadTemplate("multic.kla");
             mpSetDataOffs(2);
-            bitmapexport(40, 25);
+            mpExportBitmapData(40, 25);
             mpSetDataOffs(0x1f42);
             mpExportColorData(40, 25, 65536, 1);
             mpSetDataOffs(0x232a);
@@ -320,7 +320,7 @@
             // Advanced Art Studio
             mpLoadTemplate("multic.ocp");
             mpSetDataOffs(2);
-            bitmapexport(40, 25);
+            mpExportBitmapData(40, 25);
             mpSetDataOffs(0x1f42);
             mpExportColorData(40, 25, 65536, 1);
             mpSetDataOffs(0x233a);
@@ -336,7 +336,7 @@
     if (machine == MSX) {
         mpLoadTemplate("msx-screen2.sc2");
         mpSetDataOffs(7);
-        bitmapexport(32, 24);
+        mpExportBitmapData(32, 24);
         mpSetDataOffs(7 + (32 * 24 * 8) + 768 + 1280);
         mpExportColorData(32, 24, 65536, 3); //there's an exception for msx-style
         export_program(fname);
@@ -411,7 +411,7 @@
 
         mpLoadTemplate("c64show.prg");
         mpSetDataOffs(0X0227);
-        bitmapexport(40, 25);
+        mpExportBitmapData(40, 25);
         mpSetDataOffs(0X2167);
         mpWriteByte(g_map[0]); //=border
         mpSetDataOffs(0X2168);
@@ -432,7 +432,7 @@
 
         mpLoadTemplate("c64mshow.prg");
         mpSetDataOffs(0x0239);
-        bitmapexport(40, 25);
+        mpExportBitmapData(40, 25);
 
         // first color information
         mpSetDataOffs(0x2179);
@@ -468,7 +468,7 @@
         outputter("  .global _back2", true);
         outputter("_bitmap:", true);
         mpSetDataOffs(0x013e);
-        bitmapexport(40, 25);
+        mpExportBitmapData(40, 25);
         outputter("_border:", true);
         val1 = getpluscolor(int(g_map[0]));
         val2 = getplusluminance(int(g_map[0]));
@@ -514,7 +514,7 @@
         outputter("  .global _border", true);
         outputter("_bitmap:", true);
         mpSetDataOffs(0x0137);
-        bitmapexport(40, 25);
+        mpExportBitmapData(40, 25);
         val1 = getpluscolor(int(g_map[0]));
         val2 = getplusluminance(int(g_map[0]));
         val3 = val2 * 16 + val1;
@@ -539,7 +539,7 @@
         outputter(char(9) + ".globl _nimi1,_nimi2", true);
         outputter(char(9) + ".area _CODE", true);
         outputter("_nimi1:", true);
-        bitmapexport(32, 24);
+        mpExportBitmapData(32, 24);
         mpSetDataOffs(0x18f9);
         //mpWriteByte(g_map[1]); //backg
         //outputter("; The first following value is background", true);
@@ -635,7 +635,7 @@
         mpLoadTemplate("cpc-mode0.bin");
 
         mpSetDataOffs(69); //bitmap offset
-        bitmapexport_cpc(160, 200);
+        mpExportBitmapData_CPC(160, 200);
         mpSetDataOffs(16453);
         outputter(";palette", true);
         outputter(".byte ", false);
@@ -674,7 +674,9 @@
     }
 }
 
-void bitmapexport_cpc(int xwid, int yy) {
+
+void mpExportBitmapData_CPC(int xwid, int yy)
+{
     int x, y, ad, val1, val2, y2;
     int pix0b0, pix0b1, pix0b2, pix0b3;
     int pix1b0, pix1b1, pix1b2, pix1b3;
@@ -732,7 +734,9 @@
     outputter("", true);
 }
 
-void bitmapexport(int xx, int yy) {
+
+void mpExportBitmapData(int xx, int yy)
+{
     int xwid, ywid, x, y, y2, value, ad, linep;
     linep = 0;
     xwid = xx * 8;
@@ -763,6 +767,7 @@
     outputter("", true);
 }
 
+
 int convertlumi(int l, int f) {
     int res = 0;
     if (f == 0) return 0;