# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1530684445 -10800
# Node ID a0a00f80b0424122875bfcd140b9ce30052cf80d
# Parent  c1667eb54808b3c3964f07fb19e743220ba9d388
Make the machine setup sections a bit more uniform in order.

diff -r c1667eb54808 -r a0a00f80b042 exporters.pde
--- a/exporters.pde	Wed Jul 04 09:03:08 2018 +0300
+++ b/exporters.pde	Wed Jul 04 09:07:25 2018 +0300
@@ -1847,10 +1847,11 @@
     Y = 200;
 
     if (machine == C64) { //c64 hires
+        g_name = "c64";
         g_expname = "prg";
         g_formatname = "Art Studio";
         g_formatextension = "art";
-        g_name = "c64";
+
         g_attrimode = 1;
         g_map[1] = byte(255);
         g_map[0] = 6;
@@ -1858,12 +1859,13 @@
     }
 
     if (machine == CPC) { //Amstrad CPC mode 0
-        g_hzoomer = 2;
-        g_palsteps = 3;
         g_name = "cpc";
         g_expname = "bin";
         g_formatname = "";
         g_formatextension = "";
+
+        g_hzoomer = 2;
+        g_palsteps = 3;
         g_multic = 2;
         g_attrimode = 0;
         g_map[1] = byte(255);
@@ -1892,6 +1894,7 @@
         g_expname = "com";
         g_formatname = "Screen 2";
         g_formatextension = "sc2";
+
         X = 256;
         Y = 192;
         g_attrimode = 0;
@@ -1926,10 +1929,11 @@
     if (machine == SPECTRUM) { // ZX Spectrum
         g_name = "spec";
         g_expname = "tap";
+        g_formatname = "Screen$";
+        g_formatextension = "scr";
+
         X = 256;
         Y = 192;
-        g_formatname = "Screen$";
-        g_formatextension = "scr";
         g_farge = 7;
         g_backg = 0;
         g_attrimode = 1;
@@ -1941,6 +1945,7 @@
 
     if (machine == TIMEX) { // timex sinclair
         g_name = "tmx";
+
         X = 256;
         Y = 192;
         g_farge = 7;
@@ -1953,6 +1958,7 @@
 
     if (machine == JR200) { // Panasonic JR200
         g_name = "jr200";
+
         X = 256;
         Y = 192;
         g_maxcolors = 8;
@@ -1964,40 +1970,43 @@
     }
 
     if (machine == PLUS4M || machine == PLUS4) { // Commodore plus/4
+        g_name = "plus4m";
+        g_expname = "prg";
+        g_formatname = "M.Botticelli";
+        g_formatextension = "prg";
+
         g_backmode = 1;
         g_multic = 1;
-        g_name = "plus4m";
-        g_expname = "prg";
         g_attrimode = 1;
         g_maxcolors = 121;
         g_charlimit = 2;
+        g_map[0] = 6;
         g_map[1] = 0;
         g_map[2] = 61;
         g_farge = 61;
-        g_formatname = "M.Botticelli";
-        g_formatextension = "prg";
+
         if (machine == PLUS4) { // plus/4 hires
+            g_name = "plus4";
             g_formatname = "Botticelli";
             g_formatextension = "prg";
             g_multic = 0;
             g_backmode = 0;
             g_charlimit = 0;
-            g_name = "plus4";
             g_attrimode = 1;
             g_map[1] = byte(255);
         }
-        g_map[0] = 6;
         make_plus4_palette();
     }
 
     if (machine == C64M) { //c64 multicolor
-        g_backmode = 1;
-        g_charlimit = 3;
-        g_multic = 1;
         g_name = "c64m";
         g_expname = "prg";
         g_formatname = "A. A. Studio";
         g_formatextension = "ocp";
+
+        g_backmode = 1;
+        g_charlimit = 3;
+        g_multic = 1;
         g_attrimode = 1;
         g_map[1] = byte(0);
         g_map[0] = 6;
@@ -2005,10 +2014,10 @@
     }
 
     if (machine == AMIGA) { //generic 16bit
+        g_name = "test";
         g_backmode = 1;
         g_maxcolors = 32;
         g_palsteps = 16;
-        g_name = "test";
         g_multic = 2;
         g_attrimode = 2;
         g_map[1] = byte(0);
@@ -2026,6 +2035,7 @@
         g_formatname = "";
         g_formatextension = "";
         g_name = "afli";
+
         g_attrimode = 0;
         g_map[1] = byte(255);
         g_map[0] = 6;
@@ -2033,12 +2043,13 @@
     }
 
     if (machine == C64FLIM) { //C64 FLI multicolor
-        g_hzoomer = 2;
-        g_maxcolors = 16;
         g_name = "fli";
         g_expname = "";
         g_formatname = "";
         g_formatextension = "";
+
+        g_hzoomer = 2;
+        g_maxcolors = 16;
         g_multic = 2;
         g_attrimode = 0;
         g_map[1] = byte(255);