diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 39f0bcfe1..176ce7b58 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -15172,10 +15172,8 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski clif->messagecolor_self(sd->fd, COLOR_RED, e_msg); return 0; } - if (!(require.ammo&1<<sd->inventory_data[i]->subtype)) { //Ammo type check. Send the "wrong weapon type" message - //which is the closest we have to wrong ammo type. [Skotlex] - clif->arrow_fail(sd,0); //Haplo suggested we just send the equip-arrows message instead. [Skotlex] - //clif->skill_fail(sd, skill_id, USESKILL_FAIL_THIS_WEAPON, 0, 0); + if ((require.ammo & (1 << sd->inventory_data[i]->subtype)) == 0 || !battle->check_arrows(sd)) { // Ammo type check. + clif->arrow_fail(sd, 0); // "Please equip the proper ammunition first." return 0; } } |