summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorcsnv <ctt@csnv.es>2014-09-12 21:13:20 +0200
committercsnv <ctt@csnv.es>2014-09-12 21:13:20 +0200
commit6c3aee0298fd8457624b17e9d372168dc74174d0 (patch)
tree6f55cef7678dcd755c7f1bbc07575f40ad4208ca /src/map/skill.c
parentc3751d658e10cf134017816454e173c4632644ff (diff)
downloadhercules-6c3aee0298fd8457624b17e9d372168dc74174d0.tar.gz
hercules-6c3aee0298fd8457624b17e9d372168dc74174d0.tar.bz2
hercules-6c3aee0298fd8457624b17e9d372168dc74174d0.tar.xz
hercules-6c3aee0298fd8457624b17e9d372168dc74174d0.zip
Improved code readability
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index f3bcb85bf..3b723e406 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -11446,10 +11446,12 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 tick
if (!sce)
sc_start4(ss,bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit);
break;
+ case UNT_APPLEIDUN: // Apple of idun gets it from skill_unit_onplace_timer
+ if (!battle_config.song_timer_reset)
+ break;
case UNT_WHISTLE:
case UNT_ASSASSINCROSS:
case UNT_POEMBRAGI:
- case UNT_APPLEIDUN:
case UNT_HUMMING:
case UNT_DONTFORGETME:
case UNT_FORTUNEKISS:
@@ -11458,7 +11460,7 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 tick
return 0;
if (!sc) return 0;
- if (!sce && !(!battle_config.song_timer_reset && sg->unit_id == UNT_APPLEIDUN)) // Apple of idun gets it from skill_unit_onplace_timer
+ if (!sce)
sc_start4(ss,bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit);
else if (battle_config.song_timer_reset && sce->val4 == 1) {
//Readjust timers since the effect will not last long.