From bb183e9257bd99caeab9776b3579acf68cb203b1 Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 1 Oct 2008 17:44:09 +0000 Subject: Reworked traps: much much cleaner now. There might be bugs, though. Traps now remember how much ammo they have. The ammo quantities (from David) are rather tentative. Breaks savefiles. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7076 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abyss.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/abyss.cc') diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 3ab081c559..34a44c16ad 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -811,8 +811,11 @@ static void _corrupt_square(const crawl_environment &oenv, const coord_def &c) else feat = oenv.grid(c); - if (is_trap_square(feat) || feat == DNGN_SECRET_DOOR || feat == DNGN_UNSEEN) + if (grid_is_trap(feat, true) + || feat == DNGN_SECRET_DOOR || feat == DNGN_UNSEEN) + { return; + } if (is_traversable(grd(c)) && !is_traversable(feat) && _is_crowded_square(c)) -- cgit v1.2.3-54-g00ecf