clean master after moving of newer content to feature branch

include/config.h

@@ -531,19 +531,6 @@ typedef unsigned char uchar;
    (within the same session) */
 /* #define EDIT_GETLIN */
 
-/* Section 4b - Features causing save file incompatibility
- * Features listed in this section change the format of save and/or
- * bones files, so in addition to the warning at the start of Section 4
- * games using these features will not be compatible with previously saved
- * games (and may not be compatible with anything in the future as well).
- * To emphasize the point, you must: */
-/* #define BREAK_360_SAVE_COMPAT */
-/* to enable them. */
-
-#ifdef BREAK_360_SAVE_COMPAT
-# define CONWAY                        /* Conway's Life level */
-#endif
-
 /* #define DUMPLOG */  /* End-of-game dump logs */
 #ifdef DUMPLOG
 

include/decl.h

@@ -428,10 +428,6 @@ E struct plinemsg_type *plinemsg_types;
 E const char *ARGV0;
 #endif
 
-#ifdef DROPLEVEL
-E void NDECL((*dropleveltempsfn));
-#endif
-
 enum earlyarg {ARG_DEBUG, ARG_VERSION
 #ifdef WIN32
     ,ARG_WINDOWS

include/extern.h

@@ -1190,7 +1190,6 @@ E int FDECL(sleep_monst, (struct monst *, int, int));
 E void FDECL(slept_monst, (struct monst *));
 E void FDECL(xdrainenergym, (struct monst *, BOOLEAN_P));
 E long FDECL(attk_protection, (int));
-E int FDECL(mdamagem, (struct monst *, struct monst *, struct attack *));
 E void FDECL(rustm, (struct monst *, struct obj *));
 
 /* ### mhitu.c ### */
@@ -1278,8 +1277,6 @@ E void NDECL(water_friction);
 E void FDECL(save_waterlevel, (int, int));
 E void FDECL(restore_waterlevel, (int));
 E const char *FDECL(waterbody_name, (XCHAR_P, XCHAR_P));
-E void NDECL(conway_update);  
-E void NDECL(conway_restore);
 
 /* ### mkobj.c ### */
 

include/global.h

@@ -360,17 +360,6 @@ struct savefile_info {
 #define PANICTRACE_GDB
 #endif
 
-/* Only CONWAY requires this at the moment, but it should be generally useful. */
-#ifdef CONWAY
-# define DROPLEVEL
-#endif
-
-#ifdef DROPLEVEL
-# define DROPLEVEL_WINDUP(fn) dropleveltempsfn = &fn;
-# define DROPLEVEL_UNWIND(held) \
-    dropleveltempsfn = held; held=0; if(dropleveltempsfn)(*dropleveltempsfn)();
-#endif
-
 /* Supply nethack_enter macro if not supplied by port */
 #ifndef nethack_enter
 #define nethack_enter(argc, argv) ((void) 0)

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 {

include/sp_lev.h

@@ -32,7 +32,6 @@
 #define CORRMAZE 0x00000800L  /* for maze levels only */
 #define CHECK_INACCESSIBLES 0x00001000L /* check for inaccessible areas and
    generate ways to escape from them */
-#define FLAG_CONWAY 0x00002000L  /* avoid confusion with the value of CONWAY */
 
 /* different level layout initializers */
 enum lvlinit_types {

include/you.h

@@ -398,7 +398,5 @@ struct you {
 }; /* end of `struct you' */
 
 #define Upolyd (u.umonnum != u.umonster)
-/* something like MON_AT (rm.h) */
-#define HERO_AT(x,y) ((x)==u.ux && (y)==u.uy)
 
 #endif /* YOU_H */