# HG changeset patch # User Matti Hamalainen # Date 1533816773 -10800 # Node ID 0c2610e112c3da009c897f180778df4ce2c5510d # Parent e899ca447a69a99470df72c3bf7fadaf64a2fabf Cosmetics. diff -r e899ca447a69 -r 0c2610e112c3 draw_inputs.pde --- a/draw_inputs.pde Thu Aug 09 15:03:53 2018 +0300 +++ b/draw_inputs.pde Thu Aug 09 15:12:53 2018 +0300 @@ -140,40 +140,42 @@ int getattra(int xx, int yy, int mode) //mode foreground backround { //returns the internal foreground / background color on point xx,yy - int xv, yv, val; if (g_multic == 2) { if (mode == 0) return getmultic(xx, yy, 0); return g_backg; } + else if (g_multic == 1) { if (mode == 0) return getmultic(xx, yy, 0); return g_map[1]; // was 0? } - xx = int(xx / 8); - yv = int(yy / 8); - int ad = 65536 + xx + yy * MX; - if (mode == 0) { + + // XXX ! is this correct? yv is not used + int val, + xv = int(xx / 8), + yv = int(yy / 8); + + int ad = 65536 + xv + yy * MX; + if (mode == 0) val = g_map[ad]; - if (g_britemode == 1 && val == 8) return 0; + else + val = g_map[ad + (MX * MY) * 8]; + + if (g_britemode == 1 && val == 8) + return 0; + else return val; - } - // if(mode==1) - val = g_map[ad + (MX * MY) * 8]; - if (g_britemode == 1 && val == 8) return 0; - return val; } int getabsa(int xx, int yy, int mode) //mode 0=screen 1=brush { // returns the visible colour on point xx,yy - int sad, ssap, ad, val; - int chek; - val = 0; - sad = 1024 + xx + yy * X; - ad = 65536 + int(xx / 8) + yy * MX; + int ssap, val = 0, + sad = 1024 + xx + yy * X, + ad = 65536 + int(xx / 8) + yy * MX; - chek = int(g_map[sad]); + int chek = int(g_map[sad]); if (chek == 100 || chek == 200) return chek; @@ -192,6 +194,7 @@ if (g_britemode == 1 && val == 8) return 0; return val; } + else if (ssap == 0) { if (mode == 0) { val = g_map[ad + (MX * MY) * 8]; @@ -201,7 +204,8 @@ if (g_britemode == 1 && val == 8) return 0; return val; } - return g_map[sad]; + else + return g_map[sad]; }