diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-31 15:39:31 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-31 15:39:31 +0000 |
| commit | ed4c82279bb48950e072cdafcb1ea6bb0bcd4585 (patch) | |
| tree | e8bca6eb9af2d6f4ddfdb803fab9920e758b7782 | |
| parent | e12cb0d3e093342ff6ce93dbf4bc102cbcb7d54b (diff) | |
| download | tmwa-ed4c82279bb48950e072cdafcb1ea6bb0bcd4585.tar.gz tmwa-ed4c82279bb48950e072cdafcb1ea6bb0bcd4585.tar.bz2 tmwa-ed4c82279bb48950e072cdafcb1ea6bb0bcd4585.tar.xz tmwa-ed4c82279bb48950e072cdafcb1ea6bb0bcd4585.zip | |
Made sure that healing items work while poison is slowed
| -rw-r--r-- | src/map/pc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 1d2f61a..d7f469d 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7105,7 +7105,7 @@ static int pc_natural_heal_sub(struct map_session_data *sd,va_list ap) { if (sd->quick_regeneration_hp.amount || sd->quick_regeneration_sp.amount) { int hp_bonus = pc_quickregenerate_effect(&sd->quick_regeneration_hp, - sd->sc_data[SC_POISON].timer == -1 ? + (sd->sc_data[SC_POISON].timer == -1 || sd->sc_data[SC_SLOWPOISON].timer != -1) ? sd->nhealhp : 1); // [fate] slow down when poisoned int sp_bonus = pc_quickregenerate_effect(&sd->quick_regeneration_sp, sd->nhealsp); diff --git a/src/map/skill.c b/src/map/skill.c index ac6db98..255a7a2 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8930,7 +8930,6 @@ int skill_status_effect(struct block_list *bl, int type, int val1, int val2, int sc_data[type].spell_invocation = spell_invocation; /* タイマー設定 */ - sc_data[type].timer = add_timer( gettick() + tick, skill_status_change_timer, bl->id, type); |