summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/traps.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-12 13:13:40 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-12 13:13:40 +0000
commited3c8c2ae59a947f065499f63daa03fec3a6840d (patch)
treefa2d6529968da6fa33359f3961697b6e405c65b3 /crawl-ref/source/traps.cc
parent2368157486f9e3c0806d3d79e939fbc3533eb105 (diff)
downloadcrawl-ref-ed3c8c2ae59a947f065499f63daa03fec3a6840d.tar.gz
crawl-ref-ed3c8c2ae59a947f065499f63daa03fec3a6840d.zip
Clearing trapping nets moved into player::moveto() and level change.
This fixes some bugs (e.g. Portal spell and nets interact properly.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9036 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/traps.cc')
-rw-r--r--crawl-ref/source/traps.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index c4a7cdd1f4..b46a9c59d6 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -1064,6 +1064,9 @@ void clear_trapping_net()
if (!you.attribute[ATTR_HELD])
return;
+ if (!in_bounds(you.pos()))
+ return;
+
const int net = get_trapping_net(you.pos());
if (net != NON_ITEM)
remove_item_stationary(mitm[net]);