summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells1.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/spells1.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/spells1.cc')
-rw-r--r--crawl-ref/source/spells1.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 3358d99e6f..a520d86637 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -176,9 +176,6 @@ int blink(int pow, bool high_level_controlled_blink, bool wizard_blink)
}
else
{
- // No longer held in net.
- clear_trapping_net();
-
move_player_to_grid(beam.target, false, true, true);
// Controlling teleport contaminates the player. -- bwr
@@ -232,9 +229,6 @@ void random_blink(bool allow_partial_control, bool override_abyss)
{
mpr("You blink.");
- // No longer held in net.
- clear_trapping_net();
-
success = true;
you.moveto(target);