diff exporters.pde @ 172:e77a726a587e

Rename FLATRATIO/SQUARERATIO and gridmode OLD/NEW constants to something more sane. This also removes conflict from the keycode defs.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 23 Aug 2018 11:09:20 +0300
parents 546146bc2247
children 3ddf4d799fe6
line wrap: on
line diff
--- a/exporters.pde	Wed Aug 22 21:38:20 2018 +0300
+++ b/exporters.pde	Thu Aug 23 11:09:20 2018 +0300
@@ -1350,7 +1350,7 @@
         makecolor(i, (rgb[i] >> 16) & 0xff, (rgb[i] >> 8) & 0xff, rgb[i] & 0xff);
     }
     g_grids[1] = 0xffd0d0d0;
-    g_gridmode = NEW;
+    g_gridmode = GRIDMODE_NEW;
     g_map[13] = byte(C64);
 }
 
@@ -1551,7 +1551,7 @@
         // if(i<=8){g_grids[i]=rgb[i]+0xff282828;}
         makecolor(i, (rgb[i] >> 16) & 0xff, (rgb[i] >> 8) & 0xff, rgb[i] & 0xff);
     }
-    g_gridmode = NEW;
+    g_gridmode = GRIDMODE_NEW;
 }
 
 
@@ -1587,7 +1587,7 @@
     g_grids[7] = 0xff84faEF;
     g_grids[9] = 0xffffa99d;
     g_grids[15] = 0xffd8d8d8;
-    g_gridmode = NEW;
+    g_gridmode = GRIDMODE_NEW;
 }
 
 
@@ -1628,7 +1628,7 @@
 
         makecolor(i, (rgb[i] >> 16) & 0xff, (rgb[i] >> 8) & 0xff, rgb[i] & 0xff);
     }
-    g_gridmode = NEW;
+    g_gridmode = GRIDMODE_NEW;
 }
 
 
@@ -1644,6 +1644,8 @@
     g_formatname = "";
     g_formatext = "";
 
+    g_aspect = AR_SQUARE;
+
     g_map[3] = byte(machine);
     g_map[13] = byte(machine);
     g_palsteps = 0;
@@ -1719,7 +1721,7 @@
         Y = 192;
         g_attrimode = 0;
         g_backmode = 1;
-        g_aspect = FLATRATIO;
+        g_aspect = AR_FLAT;
         g_farge = 15;
         g_backg = 0;
 
@@ -1859,7 +1861,7 @@
         g_name = "QL";
         g_multic = 2;
         g_attrimode = 2;
-        g_aspect = FLATRATIO;
+        g_aspect = AR_FLAT;
         g_map[1] = byte(0);
         make_ql_palette();
     }
@@ -1874,7 +1876,7 @@
         g_name = "BK";
         g_multic = 2;
         g_attrimode = 2;
-        g_aspect = FLATRATIO;
+        g_aspect = AR_FLAT;
         g_map[1] = byte(0);
         make_bk_palette();
     }