Fix wallification and wallify catacombs mine end

diff --git a/dat/mines.des b/dat/mines.des
index 70069e04ee666caa6f0beb2fc58f68094493878a..7f76d7b3e9905f449261e1fabfae1c96274f5345 100644 (file)
--- a/dat/mines.des
+++ b/dat/mines.des
@@ -1142,6 +1142,7 @@ DOOR:closed,(73,5)
 DOOR:closed,(2,15)
 MAZEWALK:(36,8),west
 STAIR:(42,8),up
+WALLIFY
 
 # Objects
 OBJECT:('*',"diamond"),random

diff --git a/src/sp_lev.c b/src/sp_lev.c
index d93988660b1e07d2903a09fc09e4ad1e0e2b7a7a..c2350f9dc8b6835bb9a083bb4c7922b0475fea38 100644 (file)
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -4736,9 +4736,9 @@ struct sp_coder *coder;
         dy1 = (xchar) SP_REGION_Y1(OV_i(r));
         dx2 = (xchar) SP_REGION_X2(OV_i(r));
         dy2 = (xchar) SP_REGION_Y2(OV_i(r));
-        wallify_map(dx1 < 0 ? xstart : dx1, dy1 < 0 ? ystart : dy1,
-                    dx2 < 0 ? xstart + xsize : dx2,
-                    dy2 < 0 ? ystart + ysize : dy2);
+        wallify_map(dx1 < 0 ? (xstart-1) : dx1, dy1 < 0 ? (ystart-1) : dy1,
+                    dx2 < 0 ? (xstart + xsize + 1) : dx2,
+                    dy2 < 0 ? (ystart + ysize + 1) : dy2);
         break;
     case 1:
         if (!OV_pop_typ(r, SPOVAR_SEL))