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/src/allmain.c
+++ b/src/allmain.c
@@ -302,11 +302,6 @@ boolean resuming;
                    /* vision while buried done here */
                    else if (u.uburied)
                        under_ground(0);
-#ifdef CONWAY
-                    if (level.flags.conway){
-                        conway_update();
-                    }
-#endif

                    /* when immobile, count is in turns */
                    if (multi < 0) {