summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-06 21:49:00 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-06 21:49:00 +0000
commitd32e2b4c2c8f40f9acd6b88a45729010d758b118 (patch)
treeb0040b116d347c6ab1ca876ca9cf4e75f30baf9b /src/map/skill.c
parent0f79342a3fe4ce80a37f6792d4154fa97c8560b0 (diff)
downloadhercules-d32e2b4c2c8f40f9acd6b88a45729010d758b118.tar.gz
hercules-d32e2b4c2c8f40f9acd6b88a45729010d758b118.tar.bz2
hercules-d32e2b4c2c8f40f9acd6b88a45729010d758b118.tar.xz
hercules-d32e2b4c2c8f40f9acd6b88a45729010d758b118.zip
- Moved define CHAT_SIZE to clif.c, added define CHATBOX_SIZE to specify that 70 char limit of the input area.
- Fixed #lvup having the gm level check backwards. - Fixed the stormgust freeze counter going up even if the attack is blocked/cancelled. - Updated mes_len_check to receive max expected size as well (clif.c) - Cleaned up parsing functions for /mm, /resetskill, /resetstate, /item, /monster, /hide - git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9811 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 9dd1a6c6c..17123f72d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7130,11 +7130,9 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
break;
case WZ_STORMGUST:
- if (tsc)
- { //This should be safe as skill_additional_effect
- //won't be triggered if the attack is absorbed. [Skotlex]
- //And if the target is already frozen,
- //the counter is reset when it ends.
+ if (skill_attack(skill_get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0) > 0
+ && tsc)
+ { //Increase freeze counter if attack connects.
if (tsc->data[SC_FREEZE].val4 == sg->group_id)
tsc->data[SC_FREEZE].val3++; //SG hit counter.
else { //New SG
@@ -7142,6 +7140,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
tsc->data[SC_FREEZE].val3 = 1;
}
}
+ break;
default:
skill_attack(skill_get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
}