From: copperwater <aosdict@gmail.com>
Date: Sun, 24 May 2020 01:38:03 +0000 (-0400)
Subject: Fix: stairs could generate in themed rooms if others were available
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b67092b2a05502819acc468c3992d478b73db64a;p=nethack

Fix: stairs could generate in themed rooms if others were available

This is a simple && vs || bug. The clear intention of the code is that
stairs aren't supposed to generate in themed rooms unless there is no
other choice.

Fixes #348
---

diff --git a/src/mklev.c b/src/mklev.c
index 8a6e5f4c7..61dd00ef0 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -1661,7 +1661,7 @@ int phase;
             && ((croom != g.dnstairs_room && croom != g.upstairs_room)
                 || phase < 1)
             && (croom->rtype == OROOM
-                || ((phase < 2) || croom->rtype == THEMEROOM)));
+                || ((phase < 2) && croom->rtype == THEMEROOM)));
 }
 
 /* find a good room to generate an up or down stairs in */