diff options
| author | Haru <haru@dotalux.com> | 2016-07-13 23:53:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 23:53:23 +0200 |
| commit | 2f8399e6f7d75e67717daa747908b8d38c1e805b (patch) | |
| tree | e022df04c788e538ea1cfaa3ba19951ab32b4ab7 /src/map/clif.c | |
| parent | 0d5a0c3df4291f8e272c24e57a16582555506238 (diff) | |
| parent | 3630d991b0b1b2ac6beafdf8d0870375b7816f8f (diff) | |
| download | hercules-2f8399e6f7d75e67717daa747908b8d38c1e805b.tar.gz hercules-2f8399e6f7d75e67717daa747908b8d38c1e805b.tar.bz2 hercules-2f8399e6f7d75e67717daa747908b8d38c1e805b.tar.xz hercules-2f8399e6f7d75e67717daa747908b8d38c1e805b.zip | |
Merge pull request #1360 from 4144/skillcasting
Simplify clif_skillcasting.
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 3069e95ad..897249836 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4931,7 +4931,7 @@ void clif_skillinfo(struct map_session_data *sd,int skill_id, int inf) /// is disposable: /// 0 = yellow chat text "[src name] will use skill [skill name]." /// 1 = no text -void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime) +void clif_useskill(struct block_list* bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, uint16 skill_lv, int casttime) { #if PACKETVER < 20091124 const int cmd = 0x13e; @@ -4939,6 +4939,7 @@ void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x, const int cmd = 0x7fb; #endif unsigned char buf[32]; + int property = skill->get_ele(skill_id, skill_lv); WBUFW(buf,0) = cmd; WBUFL(buf,2) = src_id; @@ -19354,7 +19355,7 @@ void clif_defaults(void) { clif->skill_poseffect = clif_skill_poseffect; clif->skill_estimation = clif_skill_estimation; clif->skill_warppoint = clif_skill_warppoint; - clif->skillcasting = clif_skillcasting; + clif->useskill = clif_useskill; clif->produce_effect = clif_produceeffect; clif->devotion = clif_devotion; clif->spiritball = clif_spiritball; |