From: Pasi Kallinen <paxed@alt.org>
Date: Tue, 10 Mar 2020 19:49:38 +0000 (+0200)
Subject: Handle gone portal when going back in quest
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f664e83070927d89b781c382368116b131c19dd8;p=nethack

Handle gone portal when going back in quest
---

diff --git a/src/do.c b/src/do.c
index cb7480e68..ab38386c8 100644
--- a/src/do.c
+++ b/src/do.c
@@ -1507,12 +1507,11 @@ boolean at_stairs, falling, portal;
                 break;
 
         if (!ttrap) {
-            if (u.uevent.qexpelled && Is_qstart(&u.uz0)) {
-                /* we're coming back from the quest home level, after
-                   already getting expelled once. The portal back doesn't
-                   exist anymore - see expulsion(). This can only happen
-                   in wizmode.
-                 */
+            if (u.uevent.qexpelled
+                && (Is_qstart(&u.uz0) || Is_qstart(&u.uz))) {
+                /* we're coming back from or going into the quest home level,
+                   after already getting expelled once. The portal back
+                   doesn't exist anymore - see expulsion(). */
                 u_on_rndspot(0);
             } else {
                 panic("goto_level: no corresponding portal!");