diff --git a/db/packet_db.txt b/db/packet_db.txt index 32f892cb7d..f5c927cc80 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -1347,7 +1347,7 @@ packet_ver: 25 //2008-11-12aRagexeRE 0x043d,8 -0x043e,4 +//0x043e,-1 0x043f,8 //2008-12-17aRagexeRE diff --git a/src/map/chrif.c b/src/map/chrif.c index 3f377d0ed1..3b01aae982 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -1407,8 +1407,7 @@ int chrif_skillcooldown_load(int fd) { count = RFIFOW(fd, 12); //sc_count for (i = 0; i < count; i++) { struct skill_cooldown_data *data = (struct skill_cooldown_data*) RFIFOP(fd, 14 + i * sizeof (struct skill_cooldown_data)); - if (skill_blockpc_start(sd, data->skill_id, data->tick)) - clif_skill_cooldown_list(sd, data->skill_id, data->tick); + skill_blockpc_start(sd, data->skill_id, data->tick); } return 0; } diff --git a/src/map/clif.c b/src/map/clif.c index afec7f7a82..4cacf5fff8 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5060,25 +5060,6 @@ void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned #endif } -/// List of skills that have cooldown (ZC_SKILL_POSTDELAY_LIST). -/// 043e .W .W .L -/// NOTE: This will tell the client which skills are currently in cooldown when a player logs on -/// and display them in the shortcut bar. [Rytech] -void clif_skill_cooldown_list(struct map_session_data *sd, uint16 skill_id, unsigned int tick) -{ -#if PACKETVER >= 20081112 - unsigned char buf[8]; - - nullpo_retv(sd); - - WBUFW(buf,0) = 0x43e; - WBUFW(buf,2) = packet_len(0x43e); - WBUFW(buf,4) = skill_id; - WBUFL(buf,6) = tick; - clif_send(buf,packet_len(0x43e),&sd->bl,SELF); -#endif -} - /// Skill attack effect and damage. /// 0114 .W .L .L .L .L .L .W .W
.W .B (ZC_NOTIFY_SKILL) /// 01de .W .L .L .L .L .L .L .W
.W .B (ZC_NOTIFY_SKILL2) @@ -17748,7 +17729,7 @@ void packetdb_readdb(void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 25, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 25, //#0x0440 10, 4, -1, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/map/clif.h b/src/map/clif.h index 07f4bdad7a..bedbdf7e62 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -528,7 +528,6 @@ void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x, void clif_skillcastcancel(struct block_list* bl); void clif_skill_fail(struct map_session_data *sd,uint16 skill_id,enum useskill_fail_cause cause,int btype); void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned int tick); -void clif_skill_cooldown_list(struct map_session_data *sd, uint16 skill_id, unsigned int tick); int clif_skill_damage(struct block_list *src,struct block_list *dst,unsigned int tick,int sdelay,int ddelay,int64 sdamage,int div,uint16 skill_id,uint16 skill_lv,int type); //int clif_skill_damage2(struct block_list *src,struct block_list *dst,unsigned int tick,int sdelay,int ddelay,int damage,int div,uint16 skill_id,uint16 skill_lv,int type); int clif_skill_nodamage(struct block_list *src,struct block_list *dst,uint16 skill_id,int heal,int fail);