summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/traps.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-17 03:01:02 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-17 03:01:02 +0000
commit8daf70029a675aff0d9303be828f0dc7a0dc0f06 (patch)
treecd6690b03d0b77a59136fe100f498b94c7cf3d58 /crawl-ref/source/traps.cc
parenta5b02f6cb10c8d07472bce15c475c4d2f4f71ff5 (diff)
downloadcrawl-ref-8daf70029a675aff0d9303be828f0dc7a0dc0f06.tar.gz
crawl-ref-8daf70029a675aff0d9303be828f0dc7a0dc0f06.zip
Don't bother checking for and skipping over throwing nets when
generating racial traps, as set_equip_race() won't make them racial. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3082 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/traps.cc')
-rw-r--r--crawl-ref/source/traps.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 78bfa5c997..258199f2bd 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -867,13 +867,11 @@ bool trap_item(object_class_type base_type, char sub_type,
// give appropriate racial flag for Orcish Mines and Elven Halls
// should we ever allow properties of dungeon features, we could use that
- if ( item.sub_type != MI_THROWING_NET )
- {
- if (you.where_are_you == BRANCH_ORCISH_MINES)
- set_equip_race( item, ISFLAG_ORCISH );
- else if (you.where_are_you == BRANCH_ELVEN_HALLS)
- set_equip_race( item, ISFLAG_ELVEN );
- }
+ if (you.where_are_you == BRANCH_ORCISH_MINES)
+ set_equip_race( item, ISFLAG_ORCISH );
+ else if (you.where_are_you == BRANCH_ELVEN_HALLS)
+ set_equip_race( item, ISFLAG_ELVEN );
+
return (!copy_item_to_grid( item, beam_x, beam_y, 1 ));
} // end trap_item()