Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-04-21 17:52:40 -04:00
3 changed files with 67 additions and 102 deletions

View File

@@ -1863,6 +1863,7 @@ E void FDECL(forget_levels, (int));
E void NDECL(forget_traps);
E void FDECL(forget_map, (int));
E int FDECL(seffects, (struct obj *));
E boolean FDECL(drop_boulder_on_monster, (int, int, BOOLEAN_P, BOOLEAN_P));
E void FDECL(wand_explode, (struct obj *,int));
#ifdef USE_TRAMPOLI
E void FDECL(set_lit, (int,int,genericptr_t));