Merge branch 'copperwater-hallutraps-3.7' into copperwater-3.7

2019-12-19 18:37:02 -05:00
parent 0c65736a08 ff48672e0b
commit bcee4e694a
15 changed files with 89 additions and 58 deletions
--- a/include/extern.h
+++ b/include/extern.h
@@ -2653,6 +2653,7 @@ E boolean FDECL(uescaped_shaft, (struct trap *));
 E boolean NDECL(lava_effects);
 E void NDECL(sink_into_lava);
 E void NDECL(sokoban_guilt);
+E const char * FDECL(trapname, (int, BOOLEAN_P));

 /* ### u_init.c ### */