This commit is contained in:
aozhiwei 2021-08-16 14:04:47 +08:00
parent 51beedc634
commit 774add572d

View File

@ -2639,9 +2639,14 @@ void Creature::AutoSwitchWeapon()
*c->GetCurrWeapon() = Weapon(); *c->GetCurrWeapon() = Weapon();
c->GetCurrWeapon()->weapon_idx = weapon_idx; c->GetCurrWeapon()->weapon_idx = weapon_idx;
Weapon* next_weapon = c->ChooseNextSpecWeapon(slot_id); Weapon* next_weapon = c->ChooseNextSpecWeapon(slot_id);
if (!next_weapon) {
next_weapon = c->AutoChgWeapon();
}
if (next_weapon) { if (next_weapon) {
c->SetCurrWeapon(next_weapon); c->SetCurrWeapon(next_weapon);
switch_ok = true; switch_ok = true;
} else {
abort();
} }
} }
} }