diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc index 3fedac15280..e1105ad6699 100644 --- a/crawl-ref/source/ng-restr.cc +++ b/crawl-ref/source/ng-restr.cc @@ -139,7 +139,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn, } if (wpn == WPN_QUARTERSTAFF && ng.job != JOB_GLADIATOR - && !(ng.job == JOB_FIGHTER && ng.species == SP_FORMICID || ng.species == SP_ABOMINATION)) + && !(ng.job == JOB_FIGHTER && (ng.species == SP_FORMICID || ng.species == SP_ABOMINATION))) { return CC_BANNED; } diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 2cd47a17245..7716c56ed96 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -2029,7 +2029,7 @@ static void _print_overview_screen_equip(column_composer& cols, for (equipment_type eqslot : e_order) { if ((you.species != SP_OCTOPODE - || you.species != SP_ABOMINATION) + && you.species != SP_ABOMINATION) && eqslot != EQ_WEAPON && !you_can_wear(eqslot)) { diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index ba2a073eedc..0ce9e03143e 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -707,7 +707,7 @@ maybe_bool you_can_wear(equipment_type eq, bool temp) return MB_FALSE; // intentional fallthrough case EQ_RIGHT_RING: - return (you.species != SP_OCTOPODE || you.species != SP_ABOMINATION) ? MB_TRUE : MB_FALSE; + return (you.species != SP_OCTOPODE && you.species != SP_ABOMINATION) ? MB_TRUE : MB_FALSE; case EQ_RING_EIGHT: if (you.get_mutation_level(MUT_MISSING_HAND)) @@ -7208,8 +7208,8 @@ bool player::has_usable_pincers(bool allow_tran) const bool player::has_usable_claws(bool allow_tran) const { - if (!has_claws(allow_tran)) - return false; + if (has_claws(allow_tran)) + return true; if (player_equip_unrand(UNRAND_FISTS_OF_THUNDER)) return true;