diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-26 11:47:35 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-26 11:47:35 +0000 |
| commit | 24936f8280fcee3d0503c66d9d1e117c3d279d6f (patch) | |
| tree | f15affc2b9eeeceb086442da7714c865252cb6bf /crawl-ref/source/itemprop.cc | |
| parent | dae15d11b2a27f9310bf49f0e421fd267f713f28 (diff) | |
| download | crawl-ref-24936f8280fcee3d0503c66d9d1e117c3d279d6f.tar.gz crawl-ref-24936f8280fcee3d0503c66d9d1e117c3d279d6f.zip | |
Added rod of venom [1701655]. Redid some braindead staff handling.
Breaks savefiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1932 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 55af5c9b5a..65f87c3a50 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -1776,15 +1776,12 @@ bool is_throwable( const item_def &wpn, size_type bodysize ) // bool item_is_rod( const item_def &item ) { - return (item.base_type == OBJ_STAVES - && item.sub_type >= STAFF_SMITING && item.sub_type < STAFF_AIR); + return (item.base_type == OBJ_STAVES && item.sub_type >= STAFF_SMITING); } bool item_is_staff( const item_def &item ) { - // Isn't De Morgan's law wonderful. -- bwr - return (item.base_type == OBJ_STAVES - && (item.sub_type < STAFF_SMITING || item.sub_type >= STAFF_AIR)); + return (item.base_type == OBJ_STAVES && !item_is_rod(item)); } // |