diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-05 16:32:59 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-05 16:32:59 +0000 |
| commit | 791b9f2fc76ce2903e2009d4869969e7c96565aa (patch) | |
| tree | b67ef2b87dc97fcda381e17813b2eb1b7222de09 | |
| parent | b55c97ba7d925af570b10daeb649f0f65c86de40 (diff) | |
| download | hercules-791b9f2fc76ce2903e2009d4869969e7c96565aa.tar.gz hercules-791b9f2fc76ce2903e2009d4869969e7c96565aa.tar.bz2 hercules-791b9f2fc76ce2903e2009d4869969e7c96565aa.tar.xz hercules-791b9f2fc76ce2903e2009d4869969e7c96565aa.zip | |
- Small fix which should correct skill_attack damaging hidden characters when it shouldn't.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8633 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index cd0db0742..8d54d7b68 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ 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/09/05
+ * Small fix which should correct skill_attack damaging hidden characters
+ when it shouldn't. [Skotlex]
* Fixed connect_until field being a smallint rather than int in the login
table (upgrade with upgrade_svn8630.sql) [Skotlex]
2006/09/04
diff --git a/src/map/skill.c b/src/map/skill.c index acbd081c4..fb7b9e4a4 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1806,7 +1806,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds //When caster is not the src of attack, this is a ground skill, and as such, do the relevant target checking. [Skotlex] if (!status_check_skilluse(battle_config.skill_caster_check?src:NULL, bl, skillid, 2)) return 0; - } else if ((flag&0xFFF) && skill_get_nk(skillid)&NK_SPLASH) { + } else if ((flag&SD_ANIMATION) && skill_get_nk(skillid)&NK_SPLASH) { //Note that splash attacks often only check versus the targetted mob, those around the splash area normally don't get checked for being hidden/cloaked/etc. [Skotlex] if (!status_check_skilluse(src, bl, skillid, 2)) return 0; @@ -9544,6 +9544,7 @@ void skill_stop_dancing (struct block_list *src) dsd = map_id2sd(sc->data[SC_DANCING].val4); sc->data[SC_DANCING].val4 = 0; } + status_change_end(src, SC_DANCING, -1); if (dsd) |