changeset 81:7ee5e0c590bd

Clean set_machine() and rename to mpSetupMachine()
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Jul 2018 21:52:39 +0300
parents 384b301970ac
children d982486e0a85
files exporters.pde multipaint.pde
diffstat 2 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/exporters.pde	Thu Jul 05 21:51:01 2018 +0300
+++ b/exporters.pde	Thu Jul 05 21:52:39 2018 +0300
@@ -1461,7 +1461,7 @@
 }
 
 
-void set_machine(int m)
+void mpSetupMachine(int m)
 {
     machine = m;
     g_exportext = "none";
@@ -1492,7 +1492,7 @@
         g_map[0] = 6;
         make_c64_palette();
     }
-
+    else
     if (machine == CPC) { //Amstrad CPC mode 0
         g_name = "cpc";
         g_exportext = "bin";
@@ -1524,7 +1524,7 @@
         makecolor(14, 0x80, 0x80, 0xFF);
         makecolor(15, 0xFF, 0xFF, 0xFF);
     }
-
+    else
     if (machine == MSX) { // MSX
         g_name = "msx";
         g_exportext = "com";
@@ -1562,7 +1562,7 @@
         */
         make_msx_palette();
     }
-
+    else
     if (machine == SPECTRUM) { // ZX Spectrum
         g_name = "spec";
         g_exportext = "tap";
@@ -1580,7 +1580,7 @@
         g_map[1] = byte(255);
         make_spectrum_palette();
     }
-
+    else
     if (machine == TIMEX) { // timex sinclair
         g_name = "tmx";
 
@@ -1593,7 +1593,7 @@
         g_map[1] = byte(255);
         make_spectrum_palette();
     }
-
+    else
     if (machine == JR200) { // Panasonic JR200
         g_name = "jr200";
 
@@ -1606,7 +1606,7 @@
         g_map[1] = byte(255);
         make_spectrum_palette(); //cheating
     }
-
+    else
     if (machine == PLUS4M || machine == PLUS4) { // Commodore plus/4
         g_name = "plus4m";
         g_exportext = "prg";
@@ -1636,7 +1636,7 @@
         }
         make_plus4_palette();
     }
-
+    else
     if (machine == C64M) { //c64 multicolor
         g_name = "c64m";
         g_exportext = "prg";
@@ -1652,7 +1652,7 @@
         g_map[0] = 6;
         make_c64_palette();
     }
-
+    else
     if (machine == AMIGA) { //generic 16bit
         g_name = "test";
         g_exportext = "";
@@ -1674,7 +1674,7 @@
             }
         }
     }
-
+    else
     if (machine == C64FLI) { //c64 hires FLI = AFLI
         g_name = "afli";
         g_exportext = "prg";
@@ -1687,7 +1687,7 @@
         g_map[0] = 6;
         make_c64_palette();
     }
-
+    else
     if (machine == C64FLIM) { //C64 FLI multicolor
         g_name = "fli";
         g_exportext = "";
@@ -1703,7 +1703,7 @@
         g_map[0] = 6;
         make_c64_palette();
     }
-
+    else
     if (machine == FAKEX) { // Fake 8-bit computer
         g_name = "fake";
         g_exportext = "";
@@ -1719,7 +1719,7 @@
         g_backg = 0;
         make_c64_palette();
     }
-
+    else
     if (machine == PICO8) { // Pico-8 fantasy console
         g_name = "pico8";
         g_exportext = "";
@@ -1750,6 +1750,7 @@
         makecolor(14, 255, 119, 168);
         makecolor(15, 255, 214, 197);
     }
+    else
     if (machine == UNIA) { // Unia digital palette
         g_name = "unia";
         g_exportext = "";
--- a/multipaint.pde	Thu Jul 05 21:51:01 2018 +0300
+++ b/multipaint.pde	Thu Jul 05 21:52:39 2018 +0300
@@ -180,7 +180,7 @@
     makecolor(261, 0, 255, 0);
     makecolor(262, 0, 0, 255);
 
-    set_machine(machine);
+    mpSetupMachine(machine);
     g_windowx = width - (g_hedge) - (g_wzoom * X);
     g_windowx = int(g_windowx / 2);
     g_windowy = height - (g_vedge) - (g_wzoom * Y);