diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-22 03:37:55 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-22 03:37:55 +0000 |
| commit | 44e93bbade25a71f087b89dc49c9f470c5c0d736 (patch) | |
| tree | 5d89096b42e9aeea5d9a2e5f240e01ecb79d6fd4 | |
| parent | 1fed7f0d07a699772fb086c55cb6cb2fa0d642da (diff) | |
| download | hercules-44e93bbade25a71f087b89dc49c9f470c5c0d736.tar.gz hercules-44e93bbade25a71f087b89dc49c9f470c5c0d736.tar.bz2 hercules-44e93bbade25a71f087b89dc49c9f470c5c0d736.tar.xz hercules-44e93bbade25a71f087b89dc49c9f470c5c0d736.zip | |
Follow up r15749, fixed to return correct value.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15751 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 1b00abe3e..0b6812277 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1094,8 +1094,7 @@ void battle_consume_ammo(TBL_PC*sd, int skill, int lv) if (!battle_config.arrow_decrement) return; - if (skill) - { + if (skill) { qty = skill_get_ammo_qty(skill, lv); if (!qty) qty = 1; } @@ -3953,8 +3952,7 @@ int battle_damage_area( struct block_list *bl, va_list ap) { /*========================================== * ’Ê??UŒ‚?ˆ—?‚Ü‚Æ‚ß *------------------------------------------*/ -enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, unsigned int tick, int flag) -{ +enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, unsigned int tick, int flag) { struct map_session_data *sd = NULL, *tsd = NULL; struct status_data *sstatus, *tstatus; struct status_change *sc, *tsc; @@ -4064,7 +4062,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t } if (rnd()%100 < triple_rate) { if( skill_attack(BF_WEAPON,src,src,target,MO_TRIPLEATTACK,skillv,tick,0) ) - return wd.dmg_lv; + return ATK_DEF; return ATK_MISS; } } |