summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-28 13:06:54 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-28 13:06:54 +0000
commit36aafa3ff5c0cb1d468d790cb04d54ea7f4f8cd0 (patch)
tree19dae4afb493598c0303ee2ad1fc932ef6b536a8
parent5bd53de85cf7750edf92c11c3f1084b2a9b5956e (diff)
downloadhercules-36aafa3ff5c0cb1d468d790cb04d54ea7f4f8cd0.tar.gz
hercules-36aafa3ff5c0cb1d468d790cb04d54ea7f4f8cd0.tar.bz2
hercules-36aafa3ff5c0cb1d468d790cb04d54ea7f4f8cd0.tar.xz
hercules-36aafa3ff5c0cb1d468d790cb04d54ea7f4f8cd0.zip
Reverted r3619. Evidences show Margaretha Solin Card works when player is hit by Storm Gust.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14231 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cfad90154..36ae7b6cd 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2010/01/28
+ * Fixed target skill doesn't autocast on hit when hit by AoE. [Inkfish]
2010/01/24
* Prevented the changing of alliances to oppositions during WoE. (bugreport:3923) [Paradox924X]
2010/01/23
diff --git a/src/map/skill.c b/src/map/skill.c
index 7dc71da7d..b4a91e948 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1905,7 +1905,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
if( !status_isdead(bl) )
skill_additional_effect(src,bl,skillid,skilllv,dmg.flag,dmg.dmg_lv,tick);
if( damage > 0 ) //Counter status effects [Skotlex]
- skill_counter_additional_effect(dsrc,bl,skillid,skilllv,dmg.flag,tick);
+ skill_counter_additional_effect(src,bl,skillid,skilllv,dmg.flag,tick);
}
//Only knockback if it's still alive, otherwise a "ghost" is left behind. [Skotlex]