From abb8b0a2cd5577cce954f638dca5fa3f371391fb Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Wed, 13 May 2009 17:14:05 -0400 Subject: Cleans up the net code for effects Removes the 0x1f3 packet since its the same as 0x19b packet, and our client doesn't handle 0x1f3. --- src/map/atcommand.c | 2 +- src/map/clif.c | 24 ++++-------------------- src/map/clif.h | 1 - src/map/script.c | 4 ++-- 4 files changed, 7 insertions(+), 24 deletions(-) (limited to 'src/map') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 374db77..c96b8d7 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6740,7 +6740,7 @@ int atcommand_summon(const int fd, struct map_session_data* sd, const char* comm md->state.special_mob_ai=1; md->mode=mob_db[md->class].mode|0x04; md->deletetimer=add_timer(tick+60000,mob_timer_delete,id,0); - clif_misceffect2(&md->bl,344); + clif_misceffect(&md->bl,344); } clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,x,y,tick); diff --git a/src/map/clif.c b/src/map/clif.c index e053357..aa0fff9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2564,22 +2564,6 @@ int clif_misceffect(struct block_list* bl,int type) return 0; } -int clif_misceffect2(struct block_list *bl, int type) { - unsigned char buf[24]; - - nullpo_retr(0, bl); - - memset(buf, 0, packet_len_table[0x1f3]); - - WBUFW(buf,0) = 0x1f3; - WBUFL(buf,2) = bl->id; - WBUFL(buf,6) = type; - - clif_send(buf, packet_len_table[0x1f3], bl, AREA); - - return 0; - -} /*========================================== * �\���I�v�V�����ύX *------------------------------------------ @@ -6082,9 +6066,9 @@ int clif_specialeffect(struct block_list *bl, int type, int flag) { nullpo_retr(0, bl); - memset(buf, 0, packet_len_table[0x1f3]); + memset(buf, 0, packet_len_table[0x19b]); - WBUFW(buf,0) = 0x1f3; + WBUFW(buf,0) = 0x19b; WBUFL(buf,2) = bl->id; WBUFL(buf,6) = type; @@ -6098,9 +6082,9 @@ int clif_specialeffect(struct block_list *bl, int type, int flag) { } else if (flag==1) - clif_send(buf, packet_len_table[0x1f3], bl, SELF); + clif_send(buf, packet_len_table[0x19b], bl, SELF); else if (!flag) - clif_send(buf, packet_len_table[0x1f3], bl, AREA); + clif_send(buf, packet_len_table[0x19b], bl, AREA); return 0; diff --git a/src/map/clif.h b/src/map/clif.h index 078d1a6..198bbff 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -70,7 +70,6 @@ int clif_statusupack(struct map_session_data *,int,int,int); // self int clif_equipitemack(struct map_session_data *,int,int,int); // self int clif_unequipitemack(struct map_session_data *,int,int,int); // self int clif_misceffect(struct block_list*,int); // area -int clif_misceffect2(struct block_list *bl,int type); int clif_changeoption(struct block_list*); // area int clif_useitemack(struct map_session_data*,int,int,int); // self diff --git a/src/map/script.c b/src/map/script.c index d731b3f..5c3528e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -5523,11 +5523,11 @@ int buildin_misceffect(struct script_state *st) type=conv_num(st,& (st->stack->stack_data[st->start+2])); if(st->oid) - clif_misceffect2(map_id2bl(st->oid),type); + clif_misceffect(map_id2bl(st->oid),type); else{ struct map_session_data *sd=script_rid2sd(st); if(sd) - clif_misceffect2(&sd->bl,type); + clif_misceffect(&sd->bl,type); } return 0; } -- cgit v1.2.3-70-g09d2