From 77b699b8257957da2e84b70878e97af1adfccf08 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 19 Jun 2008 05:18:25 +0000 Subject: Since mons_clear_trapping_net() checks if the monster is caught in a net, a separate check before calling it is redundant, so remove instances of that. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5974 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/monstuff.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 350803d8ba..f0078313f5 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -703,8 +703,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) if (!silent && _monster_avoided_death(monster, killer, i)) return; - if (mons_is_caught(monster)) - mons_clear_trapping_net(monster); + mons_clear_trapping_net(monster); // Update list of monsters beholding player. update_beholders(monster, true); @@ -1645,8 +1644,7 @@ bool monster_blink(monsters *monster) } } - if (mons_is_caught(monster)) - mons_clear_trapping_net(monster); + mons_clear_trapping_net(monster); mgrd[monster->x][monster->y] = NON_MONSTER; -- cgit v1.2.3-54-g00ecf