summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-29 12:32:25 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-29 12:32:25 +0000
commita3002eabaa37d2fc60903d8500ac1ec21c0de8fd (patch)
tree4bd3b831d56f90f8fcd545d34ba94fc8fbf7a211
parent963beba0da94d8b4e3d4175599c570a0b1d77ad2 (diff)
downloadhercules-a3002eabaa37d2fc60903d8500ac1ec21c0de8fd.tar.gz
hercules-a3002eabaa37d2fc60903d8500ac1ec21c0de8fd.tar.bz2
hercules-a3002eabaa37d2fc60903d8500ac1ec21c0de8fd.tar.xz
hercules-a3002eabaa37d2fc60903d8500ac1ec21c0de8fd.zip
- Probably fixed splash damage.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11841 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/battle.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 309060310..b035bd67c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/11/29
+ * Probably fixed splash damage.
* Reflected spells no longer cause knockback.
* SG Blessing skills now grant the extra experience to everyone when the SG
killed the mob.
diff --git a/src/map/battle.c b/src/map/battle.c
index 13a5dfd0b..e54730cde 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2884,12 +2884,8 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
wd.dmotion = clif_damage(src, target, tick, wd.amotion, wd.dmotion, wd.damage, wd.div_ , wd.type, wd.damage2);
-// Eh, battle_calc_damage should take care of not making the off-hand dmg miss.
-// if(sd && sd->status.weapon > MAX_WEAPON_TYPE && wd.damage2 == 0)
-// clif_damage(src, target, tick+10, wd.amotion, wd.dmotion,0, 1, 0, 0);
-
if (sd && sd->splash_range > 0 && damage > 0)
- skill_castend_damage_id(src, target, 0, -1, tick, 0);
+ skill_castend_damage_id(src, target, 0, 1, tick, 0);
map_freeblock_lock();