diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-11 00:07:25 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-11 00:07:25 +0000 |
| commit | 2f22817e6ab822590613e9777f87a5690918b843 (patch) | |
| tree | f97e24f007f0201be9ac29c12d5df967fc034521 | |
| parent | d715c9de85f3870332f7fc78e7754eddfed246bc (diff) | |
| download | hercules-2f22817e6ab822590613e9777f87a5690918b843.tar.gz hercules-2f22817e6ab822590613e9777f87a5690918b843.tar.bz2 hercules-2f22817e6ab822590613e9777f87a5690918b843.tar.xz hercules-2f22817e6ab822590613e9777f87a5690918b843.zip | |
* Fixed bAutoSpellOnSkill bonuses not working independently of each other (bugreport:4617, since r13596, related r14536).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14574 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7ce5b41ef..da347adde 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2010/12/10 + * Fixed bAutoSpellOnSkill bonuses not working independently of each other (bugreport:4617, since r13596, related r14536). [Ai4rei] * Revised argument declaration of all script commands according to the actual functions' argument usage. [Ai4rei] - Fixed many script commands with fixed amount of optional parameters to no longer accept any amount of arguments due to faulty declaration. - Corrected use of dummy parameter for guildopenstorage in scripts. diff --git a/src/map/pc.c b/src/map/pc.c index 75097343d..065932636 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1500,13 +1500,7 @@ static int pc_bonus_autospell_onskill(struct s_autospell *spell, int max, short for( i = 0; i < max && spell[i].id; i++ ) { - if( spell[i].flag == src_skill && spell[i].id == id && spell[i].lv == lv && (spell[i].card_id == card_id || spell[i].rate <= 0 || rate < 0) ) - { - if( !battle_config.autospell_stacking && spell[i].rate > 0 && rate > 0 ) - return 0; - rate += spell[i].rate; - break; - } + ; // each autospell works independently } if( i == max ) |