diff options
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 88b7fde40..1dd9fa7f3 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1193,7 +1193,7 @@ static int pc_bonus_autospell_del(struct s_autospell *spell, int max, short id, if (i<0) return 0; //Nothing to substract from. j = i; - for(; i>=0 && rate > 0; i--) + for(; i>=0 && rate>0; i--) { if (spell[i].id != id || spell[i].lv != lv) continue; if (rate >= spell[i].rate) { @@ -1207,6 +1207,13 @@ static int pc_bonus_autospell_del(struct s_autospell *spell, int max, short id, rate = 0; } } + if (rate > 0 && ++j < max) + { //Tag this as "pending" autospell to remove. + spell[j].id = id; + spell[j].lv = lv; + spell[j].rate = -rate; + spell[j].card_id = 0; + } return rate; } @@ -1216,12 +1223,13 @@ static int pc_bonus_autospell(struct s_autospell *spell, int max, short id, shor pc_bonus_autospell_del(spell, max, id, lv, -rate, card_id); for (i = 0; i < max && spell[i].id; i++) { - if (spell[i].card_id == card_id && + if ((spell[i].card_id == card_id || !spell[i].card_id) && spell[i].id == id && spell[i].lv == lv) { - if (!battle_config.autospell_stacking) + if (!battle_config.autospell_stacking && spell[i].rate > 0) return 0; rate += spell[i].rate; + if (rate < 0) card_id = 0; //Reduced from debted autospell. break; } } |