From: cohrs <cohrs>
Date: Thu, 21 Sep 2006 06:24:19 +0000 (+0000)
Subject: more symhandling followup
X-Git-Tag: MOVE2GIT~896
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81d5ba40446f751e10f1d25a9c264af1adae5e1c;p=nethack

more symhandling followup
- the cause of of the odd "~" with DECgraphics appears to have been caused
by the Is_rogue_level(&u.uz) tests occurring before rogue_level was
initialized.  Perhaps there's a better way to deal with this than what I did?
---

diff --git a/include/rm.h b/include/rm.h
index c62fc02ba..3ec39dd61 100644
--- a/include/rm.h
+++ b/include/rm.h
@@ -251,9 +251,12 @@ struct textlist {
 #define H_DEC	2
 
 #ifdef REINCARNATION
-#define ROGUEHANDLING(ht) (Is_rogue_level(&u.uz) && roguehandling == (ht))
-#define SYMHANDLING(ht)   (ROGUEHANDLING(ht) || \
-			     (!Is_rogue_level(&u.uz) && symhandling == (ht)))
+#define ROGUEHANDLING(ht) (Is_rogue_level(&u.uz) && \
+			   rogue_level.dlevel != 0 && roguehandling == (ht))
+#define SYMHANDLING(ht) \
+	(ROGUEHANDLING(ht) || \
+	 ((!Is_rogue_level(&u.uz) || rogue_level.dlevel == 0) && \
+			      symhandling == (ht)))
 #else
 #define SYMHANDLING(ht)   (symhandling == (ht))
 #endif