diff options
author | Haru <haru@dotalux.com> | 2018-07-15 20:21:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-15 20:21:43 +0200 |
commit | 02e7a858fb7bcb178040f85a28a6c553d2f5d360 (patch) | |
tree | 47de0f3872fb47ac9072439ddbc36b52f8a661e5 /src/map/battle.c | |
parent | 8d028cbacdc4a424621c94a521c375baa234bdce (diff) | |
parent | 83c26fc34c8ae4badc06b3ff41fa528033a5c840 (diff) | |
download | hercules-02e7a858fb7bcb178040f85a28a6c553d2f5d360.tar.gz hercules-02e7a858fb7bcb178040f85a28a6c553d2f5d360.tar.bz2 hercules-02e7a858fb7bcb178040f85a28a6c553d2f5d360.tar.xz hercules-02e7a858fb7bcb178040f85a28a6c553d2f5d360.zip |
Merge pull request #2126 from 4144/updatepacket
Update packets and messages up to 2018-07-11
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 172f9083f..e571977fe 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6108,7 +6108,7 @@ static bool battle_check_arrows(struct map_session_data *sd) int index = sd->equip_index[EQI_AMMO]; if (index < 0) { if (sd->weapontype1 > W_KATAR && sd->weapontype1 < W_HUUMA) - clif->skill_fail(sd, 0, USESKILL_FAIL_NEED_MORE_BULLET, 0); + clif->skill_fail(sd, 0, USESKILL_FAIL_NEED_MORE_BULLET, 0, 0); else clif->arrow_fail(sd, 0); return false; @@ -6127,13 +6127,13 @@ static bool battle_check_arrows(struct map_session_data *sd) case W_GATLING: case W_SHOTGUN: if (sd->inventory_data[index]->subtype != A_BULLET) { - clif->skill_fail(sd, 0, USESKILL_FAIL_NEED_MORE_BULLET, 0); + clif->skill_fail(sd, 0, USESKILL_FAIL_NEED_MORE_BULLET, 0, 0); return false; } break; case W_GRENADE: if (sd->inventory_data[index]->subtype != A_GRENADE) { - clif->skill_fail(sd, 0, USESKILL_FAIL_NEED_MORE_BULLET, 0); + clif->skill_fail(sd, 0, USESKILL_FAIL_NEED_MORE_BULLET, 0, 0); return false; } break; @@ -6401,7 +6401,7 @@ static enum damage_lv battle_weapon_attack(struct block_list *src, struct block_ } if( type != CAST_GROUND ) { - clif->skill_fail(sd,r_skill,USESKILL_FAIL_LEVEL,0); + clif->skill_fail(sd, r_skill, USESKILL_FAIL_LEVEL, 0, 0); map->freeblock_unlock(); return wd.dmg_lv; } |