Mercurial > hg > forks > multipaint-js
changeset 3:0a8490574442
Replace newArray = oldArray.clone() pattern with arrayCopy().
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 03 Jul 2018 21:08:55 +0300 |
parents | 5eb3559e1778 |
children | a1261cd4c676 |
files | Interface.pde |
diffstat | 1 files changed, 22 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/Interface.pde Tue Jul 03 21:02:33 2018 +0300 +++ b/Interface.pde Tue Jul 03 21:08:55 2018 +0300 @@ -180,8 +180,8 @@ void store_undo() //to_undo { - if (g_spare == 0) g_undob[g_uindex[g_spare]] = g_map.clone(); - if (g_spare == 1) g_undobs[g_uindex[g_spare]] = g_map.clone(); + if (g_spare == 0) arrayCopy(g_map, g_undob[g_uindex[g_spare]]); + if (g_spare == 1) arrayCopy(g_map, g_undobs[g_uindex[g_spare]]); g_uindex[g_spare]++; if (g_uindex[g_spare] > 10) g_uindex[g_spare] = 0; if (g_uindex[g_spare] == g_ubottom[g_spare]) { @@ -196,12 +196,13 @@ void restore_undo() { if (g_uindex[g_spare] == g_ubottom[g_spare]) return; - if (g_spare == 0) g_undob[g_uindex[g_spare]] = g_map.clone(); - if (g_spare == 1) g_undobs[g_uindex[g_spare]] = g_map.clone(); + + if (g_spare == 0) arrayCopy(g_map, g_undob[g_uindex[g_spare]]); + if (g_spare == 1) arrayCopy(g_map, g_undobs[g_uindex[g_spare]]); g_uindex[g_spare]--; if (g_uindex[g_spare] < 0) g_uindex[g_spare] = 10; - if (g_spare == 0) g_map = g_undob[g_uindex[g_spare]].clone(); - if (g_spare == 1) g_map = g_undobs[g_uindex[g_spare]].clone(); + if (g_spare == 0) arrayCopy(g_undob[g_uindex[g_spare]], g_map); + if (g_spare == 1) arrayCopy(g_undobs[g_uindex[g_spare]], g_map); refreshpalette(); ustats(); @@ -211,8 +212,8 @@ if (g_uindex[g_spare] == g_utop[g_spare]) return; g_uindex[g_spare]++; if (g_uindex[g_spare] > 10) g_uindex[g_spare] = 0; - if (g_spare == 0) g_map = g_undob[g_uindex[g_spare]].clone(); - if (g_spare == 1) g_map = g_undobs[g_uindex[g_spare]].clone(); + if (g_spare == 0) arrayCopy(g_undob[g_uindex[g_spare]], g_map); + if (g_spare == 1) arrayCopy(g_undobs[g_uindex[g_spare]], g_map); if (g_uindex[g_spare] > 10) g_uindex[g_spare] = 0; refreshpalette(); ustats(); @@ -221,15 +222,15 @@ void spare() //dpaint style spare page { if (g_spare == 0) { // in REAL page, change to SPARE page - g_swappage = g_sparepage.clone(); - g_sparepage = g_map.clone(); - g_map = g_swappage.clone(); - frame.setTitle(sfilename); + arrayCopy(g_sparepage, g_swappage); + arrayCopy(g_map, g_sparepage); + arrayCopy(g_swappage, g_map); + mpSetTitle(sfilename); } else { // in SPARE page, change to REAL page - g_swappage = g_sparepage.clone(); - g_sparepage = g_map.clone(); - g_map = g_swappage.clone(); - frame.setTitle(filename); + arrayCopy(g_sparepage, g_swappage); + arrayCopy(g_map, g_sparepage); + arrayCopy(g_swappage, g_map); + mpSetTitle(filename); } g_spare = 1 - g_spare; g_realfront = byte(g_farge); @@ -243,10 +244,10 @@ // tool is active etc. switch (di) { case 0: - g_rmap = g_map.clone(); + arrayCopy(g_map, g_rmap); break; case 1: - g_map = g_rmap.clone(); + arrayCopy(g_rmap, g_map); for (int i = 0; i < 1024; i++) { if (g_remdo[i] == 1) { g_remdo[i] = 0; @@ -255,13 +256,13 @@ } break; case 2: - g_brush = g_map.clone(); + arrayCopy(g_map, g_brush); break; case 3: - g_sparepage = g_map.clone(); + arrayCopy(g_map, g_sparepage); break; case 4: - g_map = g_sparepage.clone(); + arrayCopy(g_sparepage, g_mapm); break; } }