clean master after moving of newer content to feature branch

2018-12-10 22:16:08 -05:00
parent 00efee7948
commit ca84486133
28 changed files with 257 additions and 927 deletions
--- a/include/rm.h
+++ b/include/rm.h
@@ -580,9 +580,6 @@ struct levelflags {
                                  normal mode descendant of such) */
    Bitfield(corrmaze, 1);     /* Whether corridors are used for the maze
                                  rather than ROOM */
-#ifdef CONWAY
-    Bitfield(conway, 1);
-#endif
 };

 typedef struct {