changeset 50:8ba88c25f51d

Rename some variables.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Jul 2018 18:45:46 +0300
parents 2d9a674bdeb2
children f9da5fe9a891
files Interface.pde events.pde exporters.pde multipaint.pde
diffstat 4 files changed, 31 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/Interface.pde	Wed Jul 04 18:44:11 2018 +0300
+++ b/Interface.pde	Wed Jul 04 18:45:46 2018 +0300
@@ -715,7 +715,7 @@
             teks = "Bitmap only|on/off";
             break;
         case 'A':
-            teks = "Export as|" + g_expname;
+            teks = "Export as|" + g_exportext;
             break;
         case 'b':
             teks = "A.I.|Behavior|on/off";
--- a/events.pde	Wed Jul 04 18:44:11 2018 +0300
+++ b/events.pde	Wed Jul 04 18:45:46 2018 +0300
@@ -544,7 +544,7 @@
         }
         if (g_data[int('W')] == 1) {
             g_data[int('W')] = 0;
-            if (g_formatextension != "") {
+            if (g_formatext != "") {
                 exportfmt = true;
                 message("Format|export");
             } else {
--- a/exporters.pde	Wed Jul 04 18:44:11 2018 +0300
+++ b/exporters.pde	Wed Jul 04 18:45:46 2018 +0300
@@ -3,7 +3,7 @@
 // the machine_export() makes use of bitmapexport() and colorexport() below
 // remember hexdump -C !
 
-String g_formatname, g_formatextension;
+String g_formatname, g_formatext;
 int g_headpos;
 int[] g_grids = new int[16];
 int OLD = 0;
@@ -1839,7 +1839,7 @@
 void set_machine(int m)
 {
     machine = m;
-    g_expname = "none";
+    g_exportext = "none";
     g_map[3] = byte(machine);
     g_map[13] = byte(machine);
     g_palsteps = 0;
@@ -1850,16 +1850,16 @@
     g_hzoomer = 1;
     g_backmode = 0;
     g_formatname = "";
-    g_formatextension = "";
+    g_formatext = "";
     g_maxcolors = 16;
     X = 320;
     Y = 200;
 
     if (machine == C64) { //c64 hires
         g_name = "c64";
-        g_expname = "prg";
+        g_exportext = "prg";
         g_formatname = "Art Studio";
-        g_formatextension = "art";
+        g_formatext = "art";
 
         g_attrimode = 1;
         g_map[1] = byte(255);
@@ -1869,9 +1869,9 @@
 
     if (machine == CPC) { //Amstrad CPC mode 0
         g_name = "cpc";
-        g_expname = "bin";
+        g_exportext = "bin";
         g_formatname = "";
-        g_formatextension = "";
+        g_formatext = "";
 
         g_hzoomer = 2;
         g_palsteps = 3;
@@ -1900,9 +1900,9 @@
 
     if (machine == MSX) { // MSX
         g_name = "msx";
-        g_expname = "com";
+        g_exportext = "com";
         g_formatname = "Screen 2";
-        g_formatextension = "sc2";
+        g_formatext = "sc2";
 
         X = 256;
         Y = 192;
@@ -1937,9 +1937,9 @@
 
     if (machine == SPECTRUM) { // ZX Spectrum
         g_name = "spec";
-        g_expname = "tap";
+        g_exportext = "tap";
         g_formatname = "Screen$";
-        g_formatextension = "scr";
+        g_formatext = "scr";
 
         X = 256;
         Y = 192;
@@ -1980,9 +1980,9 @@
 
     if (machine == PLUS4M || machine == PLUS4) { // Commodore plus/4
         g_name = "plus4m";
-        g_expname = "prg";
+        g_exportext = "prg";
         g_formatname = "M.Botticelli";
-        g_formatextension = "prg";
+        g_formatext = "prg";
 
         g_backmode = 1;
         g_multic = 1;
@@ -1997,7 +1997,7 @@
         if (machine == PLUS4) { // plus/4 hires
             g_name = "plus4";
             g_formatname = "Botticelli";
-            g_formatextension = "prg";
+            g_formatext = "prg";
             g_multic = 0;
             g_backmode = 0;
             g_charlimit = 0;
@@ -2009,9 +2009,9 @@
 
     if (machine == C64M) { //c64 multicolor
         g_name = "c64m";
-        g_expname = "prg";
+        g_exportext = "prg";
         g_formatname = "A. A. Studio";
-        g_formatextension = "ocp";
+        g_formatext = "ocp";
 
         g_backmode = 1;
         g_charlimit = 3;
@@ -2024,9 +2024,9 @@
 
     if (machine == AMIGA) { //generic 16bit
         g_name = "test";
-        g_expname = "";
+        g_exportext = "";
         g_formatname = "";
-        g_formatextension = "";
+        g_formatext = "";
 
         g_backmode = 1;
         g_maxcolors = 32;
@@ -2045,9 +2045,9 @@
 
     if (machine == C64FLI) { //c64 hires FLI = AFLI
         g_name = "afli";
-        g_expname = "prg";
+        g_exportext = "prg";
         g_formatname = "";
-        g_formatextension = "";
+        g_formatext = "";
 
         g_attrimode = 0;
         g_map[1] = byte(255);
@@ -2057,9 +2057,9 @@
 
     if (machine == C64FLIM) { //C64 FLI multicolor
         g_name = "fli";
-        g_expname = "";
+        g_exportext = "";
         g_formatname = "";
-        g_formatextension = "";
+        g_formatext = "";
 
         g_hzoomer = 2;
         g_maxcolors = 16;
@@ -2072,9 +2072,9 @@
 
     if (machine == FAKEX) { // Fake 8-bit computer
         g_name = "fake";
-        g_expname = "";
+        g_exportext = "";
         g_formatname = "";
-        g_formatextension = "";
+        g_formatext = "";
 
         X = 320;
         Y = 200;
@@ -2087,9 +2087,9 @@
 
     if (machine == PICO8) { // Pico-8 fantasy console
         g_name = "pico8";
-        g_expname = "";
+        g_exportext = "";
         g_formatname = "";
-        g_formatextension = "";
+        g_formatext = "";
 
         X = 128;
         Y = 128;
@@ -2116,9 +2116,9 @@
     }
     if (machine == UNIA) { // Unia digital palette
         g_name = "unia";
-        g_expname = "";
+        g_exportext = "";
         g_formatname = "";
-        g_formatextension = "";
+        g_formatext = "";
 
         X = 256;
         Y = 192;
--- a/multipaint.pde	Wed Jul 04 18:44:11 2018 +0300
+++ b/multipaint.pde	Wed Jul 04 18:45:46 2018 +0300
@@ -25,7 +25,7 @@
 int g_omag, g_bordh, g_bordv, g_keymacpos, g_framec;
 
 boolean fileselect = false, saveas = false, refselect = false, g_control = false, g_shift = false, exporttxt = false, importfmt = false, exportemu = false, exportfmt = false;
-String path = "", refpath = "", filename = "", elename = "", sfilename = "", refname = "", g_expname = "", g_keymacro = "";
+String path = "", refpath = "", filename = "", elename = "", sfilename = "", refname = "", g_exportext = "", g_keymacro = "";
 
 int[] g_r = new int[266];
 int[] g_g = new int[266];