static bool is_riding_two_hands(PlayerType *player_ptr)
{
- if (!player_ptr->riding || none_bits(player_ptr->pet_extra_flags, PF_TWO_HANDS)) {
+ if (!player_ptr->riding) {
return false;
}
return true;
}
- switch (player_ptr->pclass) {
- case PlayerClassType::MONK:
- case PlayerClassType::FORCETRAINER:
- case PlayerClassType::BERSERKER:
- return (empty_hands(player_ptr, false) != EMPTY_HAND_NONE) && !has_melee_weapon(player_ptr, INVEN_MAIN_HAND) && !has_melee_weapon(player_ptr, INVEN_SUB_HAND);
- default:
- return false;
+ if (any_bits(player_ptr->pet_extra_flags, PF_TWO_HANDS)) {
+ switch (player_ptr->pclass) {
+ case PlayerClassType::MONK:
+ case PlayerClassType::FORCETRAINER:
+ case PlayerClassType::BERSERKER:
+ return (empty_hands(player_ptr, false) != EMPTY_HAND_NONE) && !has_melee_weapon(player_ptr, INVEN_MAIN_HAND) && !has_melee_weapon(player_ptr, INVEN_SUB_HAND);
+ default:
+ break;
+ }
}
+
+ return false;
}
static int16_t calc_riding_bow_penalty(PlayerType *player_ptr)