diff options
author | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-30 19:07:02 +0000 |
---|---|---|
committer | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-30 19:07:02 +0000 |
commit | f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e (patch) | |
tree | 5d41fd36f550a161b764923f82484587032f5466 /src/map/battle.c | |
parent | e81fad940ac591a6a76ecd0aa0b1d26cff688705 (diff) | |
download | hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.tar.gz hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.tar.bz2 hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.tar.xz hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.zip |
* Follow up r17065
Fixed some error when creating vars and some warnings.(bugreport:7074)
* Removed an undisered warning on script's sscanf. (bugreport:7059)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17066 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 7910006e3..13e740e88 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4540,7 +4540,8 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int } if(sc->data[SC_DEATHBOUND] && skill_id != WS_CARTTERMINATION && !(src->type == BL_MOB && is_boss(src)) ) { uint8 dir = map_calc_dir(bl,src->x,src->y), - t_dir = unit_getdir(bl), rd1 = 0; + t_dir = unit_getdir(bl); + int rd1 = 0; if( distance_bl(src,bl) <= 0 || !map_check_dir(dir,t_dir) ) { rd1 = (int64)min(damage,status_get_max_hp(bl)) * sc->data[SC_DEATHBOUND]->val2 / 100; // Amplify damage. |