clean master after moving of newer content to feature branch

This commit is contained in:
nhmall
2018-12-10 22:16:08 -05:00
parent 00efee7948
commit ca84486133
28 changed files with 257 additions and 927 deletions

View File

@@ -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 ### */