From: Pasi Kallinen <paxed@alt.org>
Date: Wed, 11 Mar 2020 17:21:38 +0000 (+0200)
Subject: Flip locations only if inside the flip area
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9adb11238a2a0c7a93ff521802164dccd9b787a2;p=nethack

Flip locations only if inside the flip area

Objects and hero outside the level area (embedded in undiggable
rock by eg. polying into earth elemental) cannot be flipped.
---

diff --git a/src/sp_lev.c b/src/sp_lev.c
index c2092ff93..25f55fa22 100755
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -487,6 +487,9 @@ boolean extras;
 
     /* traps */
     for (ttmp = g.ftrap; ttmp; ttmp = ttmp->ntrap) {
+        if (ttmp->tx < minx || ttmp->tx > maxx
+            || ttmp->ty < miny || ttmp->ty > maxy)
+            continue;
 	if (flp & 1) {
 	    ttmp->ty = FlipY(ttmp->ty);
 	    if (ttmp->ttyp == ROLLING_BOULDER_TRAP) {
@@ -511,6 +514,9 @@ boolean extras;
 
     /* objects */
     for (otmp = fobj; otmp; otmp = otmp->nobj) {
+        if (otmp->ox < minx || otmp->ox > maxx
+            || otmp->oy < miny || otmp->oy > maxy)
+            continue;
 	if (flp & 1)
 	    otmp->oy = FlipY(otmp->oy);
 	if (flp & 2)
@@ -519,6 +525,9 @@ boolean extras;
 
     /* buried objects */
     for (otmp = g.level.buriedobjlist; otmp; otmp = otmp->nobj) {
+        if (otmp->ox < minx || otmp->ox > maxx
+            || otmp->oy < miny || otmp->oy > maxy)
+            continue;
 	if (flp & 1)
 	    otmp->oy = FlipY(otmp->oy);
 	if (flp & 2)
@@ -704,10 +713,13 @@ boolean extras;
     }
 
     if (extras) {
-        if (flp & 1)
-            u.uy = FlipY(u.uy), u.uy0 = FlipY(u.uy0);
-        if (flp & 2)
-            u.ux = FlipX(u.ux), u.ux0 = FlipX(u.ux0);
+        /* flip hero location only if inside the flippable area */
+        if (!(u.ux < minx || u.ux > maxx || u.uy < miny || u.uy > maxy)) {
+            if (flp & 1)
+                u.uy = FlipY(u.uy), u.uy0 = FlipY(u.uy0);
+            if (flp & 2)
+                u.ux = FlipX(u.ux), u.ux0 = FlipX(u.ux0);
+        }
     }
 
     fix_wall_spines(1, 0, COLNO - 1, ROWNO - 1);