summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-24 14:45:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-24 14:45:30 +0000
commite7a428751f8a9c99a7f1d1ba29d6363fd2528f32 (patch)
tree5136a1f5d6b7cf76c40dd4beaa827ff42c49244b
parente52640627fce60823f1d5f82ebe4e611b3e38ec0 (diff)
downloadhercules-e7a428751f8a9c99a7f1d1ba29d6363fd2528f32.tar.gz
hercules-e7a428751f8a9c99a7f1d1ba29d6363fd2528f32.tar.bz2
hercules-e7a428751f8a9c99a7f1d1ba29d6363fd2528f32.tar.xz
hercules-e7a428751f8a9c99a7f1d1ba29d6363fd2528f32.zip
- Corrected SL KA* spells not working on other Soul Linkers.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6727 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 224fc1810..4d33ee983 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.
2006/05/24
+ * Corrected SL KA* spells not working on other Soul Linkers. [Skotlex]
* Corrected a pair of incorrect sql query parsing logic in the login-sql
ban request packet. [Skotlex]
2006/05/23
diff --git a/src/map/skill.c b/src/map/skill.c
index be7c1a6cb..31dbd82dc 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4070,7 +4070,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if (sd) {
if (!dstsd || !(
(sd->sc.data[SC_SPIRIT].timer != -1 && sd->sc.data[SC_SPIRIT].val2 == SL_SOULLINKER) ||
- (dstsd->class_&MAPID_BASEMASK) == MAPID_SOUL_LINKER ||
+ (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER ||
dstsd->char_id == sd->char_id ||
dstsd->char_id == sd->status.partner_id ||
dstsd->char_id == sd->status.child
@@ -8678,7 +8678,7 @@ int skill_autospell(struct map_session_data *sd,int skillid)
maxlv = lv;
sc_start4(&sd->bl,SC_AUTOSPELL,100,skilllv,skillid,maxlv,0, // val1:スキルID val2:使用?ナ大Lv
- skill_get_time(SA_AUTOSPELL,skilllv));// にしてみたけどbscriptが?曹ォ易い????H
+ skill_get_time(SA_AUTOSPELL,skilllv));// にしてみたけどbscriptが?曹ォ易い????H
return 0;
}