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 c62fc02baffa0554c1000a021b6fab233324d0e3..3ec39dd61dd1846d01aef7a83c7375a277507597 100644 (file)
--- 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