From f6acae8ecbe7ad52b12f04c9c19c20652dee56a8 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 26 Jun 2021 19:56:39 +0100 Subject: [PATCH] Clipboard support for overlay tiles --- !TheEsc/!MapEdit,ff8 | Bin 11192 -> 11288 bytes !TheEsc/c/MapEdit | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index 4df56f01520a70d2f666a5d02742254927ff956f..8594123cca0a9c8e482e210fc7541fce3457ec3f 100644 GIT binary patch delta 3529 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 u@2M%$t$cNnjo+W-8hhgyQ9VWoL;fV{8yLM97f readmodkey) { clipboard = fullmap[TilePlayer.rawtile]; + clipboard_overlay = fullmap[TilePlayer.rawtile + 10000]; clipboard_tileid = TilePlayer.rawtile; readmodkey = tick + 10; } @@ -535,7 +537,7 @@ void game2_tick_input() if(tick > readmodkey) { fullmap[TilePlayer.rawtile] = clipboard; - + fullmap[TilePlayer.rawtile + 10000] = clipboard_overlay; for(i = 0; i < SMARTTILES; i++) { if(SmartTiles[i].Tile == clipboard_tileid) @@ -758,9 +760,17 @@ int game2_tick() x = 1180; y = 750; - - sprintf(tilenamebuffer,"%i",clipboard); + + if(clipboard > 127) + sprintf(tilenamebuffer,"%i",clipboard - 128); + else + sprintf(tilenamebuffer,"%i",clipboard); draw_tile(tilenamebuffer,x,y); + if(clipboard_overlay > 0) + { + sprintf(tilenamebuffer,"%i",clipboard_overlay); + draw_tile_trans(tilenamebuffer,x,y); + } draw_sprite("select1",x,y); sprintf(tilenamebuffer,"%i",clipboard_tileid); draw_spritetext(tilenamebuffer, x+10, y+30);