diff options
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index a55bff6810..c20914e251 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -363,7 +363,7 @@ void wield_effects(int item_wield_2, bool showMsgs) if (you.inv[item_wield_2].base_type == OBJ_WEAPONS) { - if (is_demonic(you.inv[item_wield_2].sub_type) + if (is_demonic(you.inv[item_wield_2]) && (you.religion == GOD_ZIN || you.religion == GOD_SHINING_ONE || you.religion == GOD_ELYVILON)) { @@ -1090,9 +1090,9 @@ int get_fire_item_index( void ) // check if we have ammo for a wielded launcher: if (weapon != -1 && you.inv[ weapon ].base_type == OBJ_WEAPONS - && launches_things( you.inv[ weapon ].sub_type )) + && is_range_weapon( you.inv[ weapon ] )) { - int type_wanted = launched_by( you.inv[ weapon ].sub_type ); + int type_wanted = fires_ammo_type( you.inv[ weapon ] ); item = try_finding_missile( type_wanted ); } break; |