fix(zq): more tile page problems from 4-bit: scaling, overlay

Author: connorjclark

src/tiles.cpp

@@ -448,7 +448,7 @@ void overlay_tile(tiledata *buf,int32_t dest,int32_t src,int32_t cs,bool backwar
 
     unpack_tile(buf, src, 0, false);
 
-    if(buf[src].format>tf4Bit)
+    // if(buf[src].format>tf4Bit)
     {
         cs=0;
     }
@@ -559,14 +559,17 @@ bool write_tile(tiledata *buf, BITMAP* src, int32_t dest, int32_t x, int32_t y,
     return true;
 }
 
+// For the editor only, grabbing code mades weird assumptions where it deletes the first tile
+// just before drawing it, which relies on it being cached (see top of unpack_tile).
+// See draw_grab_scr. Crash would happen from calling `puttile16` after `newtilebuf[0].data=NULL;`.
+// No time to work this out just yet, so avoid the fast path in this case.
+// This is also need for the bottom two "previous data" tiles to render correctly in grab menu.
+bool zq_allow_tile_draw_cache = false;
+
 static const byte* get_tile_bytes(int32_t tile, int32_t flip)
 {
-	// For the editor only, grabbing code mades weird assumptions where it deletes the first tile
-	// just before drawing it, which relies on it being cached (see top of unpack_tile).
-	// See draw_grab_scr. Crash would happen from calling `puttile16` after `newtilebuf[0].data=NULL;`.
-	// No time to work this out just yet, so avoid the fast path in this case.
 #if IS_EDITOR
-	if (flip == 0 && tile != 0)
+	if (flip == 0 && !zq_allow_tile_draw_cache)
 #else
     if (flip == 0)
 #endif

src/tiles.h

@@ -21,6 +21,7 @@ extern bool blank_tile_quarters_table[NEWMAXTILES*4];       //keeps track of bla
 extern byte unpackbuf[256];
 extern const char *tileformat_string[tfMax];
 extern comboclass   *combo_class_buf;
+extern bool zq_allow_tile_draw_cache;
 
 void register_blank_tiles();
 void register_blank_tiles(int32_t max);

src/zq/zq_tiles.cpp

@@ -1804,7 +1804,7 @@ void normalize(int32_t tile,int32_t tile2, bool rect_sel, int32_t flip)
 void rotate_tile(int32_t tile, bool backward)
 {
 	unfloat_selection();
-	unpack_tile(newtilebuf, tile, 0, false);
+	unpack_tile(newtilebuf, tile, 0, true);
 	byte tempunpackbuf[256];
 	byte tempx, tempy;
 
@@ -4821,6 +4821,8 @@ void grab(byte(*dest)[256],byte *def, int32_t width, int32_t height, int32_t ofo
 //Grabber is not grabbing to tile pages beyond pg. 252 right now. -ZX 18th June, 2019 
 void grab_tile(int32_t tile,int32_t &cs)
 {
+	zq_allow_tile_draw_cache = true;
+
 	int window_w = 640+6+6, window_h = 480+25+6;
 	int window_x=(zq_screen_w-window_w)/2;
 	int window_y=(zq_screen_h-window_h)/2;
@@ -5469,6 +5471,8 @@ void grab_tile(int32_t tile,int32_t &cs)
 	calc_cset_reduce_table(imagepal, cs);
 	register_blank_tiles();
 	popup_zqdialog_end();
+
+	zq_allow_tile_draw_cache = false;
 }
 
 int32_t show_only_unused_tiles=4; //1 bit: hide used, 2 bit: hide unused, 4 bit: hide blank