From ab3bcabd63cf991682c3199f1f5a47f5cb378714 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Tue, 31 Aug 2021 21:43:06 +0100
Subject: [PATCH] Put 'solid' indicator on top of any overlays

---
 !TheEsc/!MapEdit,ff8 | Bin 11556 -> 11556 bytes
 !TheEsc/c/MapEdit    |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8
index e7f2decbbde7cd9719186febe7c194da88c7c782..a10053d8a225672f83960b37d0e77cdeda33d862 100644
GIT binary patch
delta 83
zcmZ1ywIpgofB<KRru<VDhMUiSOnxY!Jh?_dhIa-~goj}+Q1rs{H9%2)Q8pHa(-lnf
mpE58^c-nBV;Q<3v&x1FUR|+U|Oyci<bc~7N^=1)40T}>+C?Q7x

delta 98
zcmV-o0G<D&TBKUAP!Jdd0NLmK5})M&5Rv79!GYib5{%$zDIevNXb><FxB{Q$005BX
zfWd&^00NBQtdr>wBNd_#kK)z>0PEB#ALR@Ho#g}o(C2WISr8+W$Pf$!_X7aSvlI~!
E9Au#>H~;_u

diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit
index 728933d..1577076 100644
--- a/!TheEsc/c/MapEdit
+++ b/!TheEsc/c/MapEdit
@@ -608,10 +608,6 @@ int game2_tick()
         {
           map[screen+1][x][y] = map[0][x][y];
           draw_tile(map[screen+1][x][y] & 127,x*100,y*100);
-          if(((map[screen+1][x][y] >> 7)  & 0x01))
-          {
-          draw_sprite("solid",x*100,y*100);
-          }
 
           map_overlay[screen+1][x][y] = map_overlay[0][x][y];
           if(map_overlay[screen+1][x][y] > 0)
@@ -619,6 +615,11 @@ int game2_tick()
             draw_tile_trans(map_overlay[screen+1][x][y],x*100,y*100);
           }
 
+          if(((map[screen+1][x][y] >> 7)  & 0x01))
+          {
+          draw_sprite("solid",x*100,y*100);
+          }
+
           udt++;
         }