Merge branch 'derek-elbereth'
* derek-elbereth: ensure that the 'safe' objects remain safe finish up the changes to trigger erosion on use initial pass for toning down Elbereth Conflicts: dat/castle.des dat/sokoban.des include/extern.h src/engrave.c src/mklev.c src/monmove.c src/zap.c
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
/* NetHack 3.6 mklev.c $NHDT-Date: 1426465436 2015/03/16 00:23:56 $ $NHDT-Branch: debug $:$NHDT-Revision: 1.25 $ */
|
||||
/* NetHack 3.6 mklev.c $Date: 2012/02/15 01:55:33 $ $Revision: 1.20 $ */
|
||||
/* NetHack 3.6 mklev.c $NHDT-Date: 1430172946 2015/04/27 22:15:46 $ $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.38 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -495,7 +494,7 @@ int trap_type;
|
||||
if (trap_engravings[trap_type]) {
|
||||
make_engr_at(xx, yy-dy,
|
||||
trap_engravings[trap_type], 0L, DUST);
|
||||
wipe_engr_at(xx, yy-dy, 5); /* age it a little */
|
||||
wipe_engr_at(xx, yy-dy, 5, FALSE); /* age it a little */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user