diff --git a/Changelog.txt b/Changelog.txt index 71632ff82b..4cf83d4f40 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Date Added 11/09 + * clif.c: Fixed sitting. [spira] * - Fixed item 657 Job ID , 11/09 patch updates to item_db, Correct stats for item 5097 - Added Unbreakable funcions to item_db armors/shields/garments/footgear [shadow] * Defined SO_REUSEPORT to allow the servers to re-use ports if server crashes [Wizputer] diff --git a/src/map/clif.c b/src/map/clif.c index d78fc5397b..de47cb20c3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7137,16 +7137,16 @@ void clif_callpartner(struct map_session_data *sd) * 座る *------------------------------------------ */ -void clif_sitting(int fd, struct map_session_data *sd) +void clif_sitting(struct map_session_data *sd) { + unsigned char buf[64]; + nullpo_retv(sd); - fd=sd->fd; - - WBUFW(fd, 0) = 0x8a; - WBUFL(fd, 2) = sd->bl.id; - WBUFB(fd,26) = 2; - clif_send(WFIFOP(fd,0),packet_db[0x8a].len,&sd->bl,AREA); + WBUFW(buf, 0) = 0x8a; + WBUFL(buf, 2) = sd->bl.id; + WBUFB(buf,26) = 2; + clif_send(buf, packet_len_table[0x8a], &sd->bl, AREA); } /*========================================== @@ -7896,7 +7896,7 @@ void clif_parse_ActionRequest(int fd, struct map_session_data *sd, int cmd) pc_stop_walking(sd,1); skill_gangsterparadise(sd,1);/* ギャングスターパラダイス設定 */ pc_setsit(sd); - clif_sitting(fd,sd); + clif_sitting(sd); } else clif_skill_fail(sd, 1, 0, 2); break; diff --git a/src/map/clif.h b/src/map/clif.h index 5a04d41d60..cf2228e6b6 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -98,7 +98,7 @@ int clif_changechatstatus(struct chat_data*); // chat void clif_emotion(struct block_list *bl,int type); void clif_talkiebox(struct block_list *bl,char* talkie); void clif_wedding_effect(struct block_list *bl); -void clif_sitting(int fd, struct map_session_data *sd); +void clif_sitting(struct map_session_data *sd); //void clif_callpartner(struct map_session_data *sd); //void clif_sitting(struct map_session_data *sd); void clif_soundeffect(struct map_session_data *sd,struct block_list *bl,char *name,int type); diff --git a/src/map/skill.c b/src/map/skill.c index 7d52a689ce..15c02e5192 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2999,7 +2999,7 @@ int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int case LK_TENSIONRELAX: /* テンションリラックス */ clif_skill_nodamage(src,bl,skillid,skilllv,1); pc_setsit(sd); - clif_sitting(sd->fd,sd); + clif_sitting(sd); skill_status_change_start(bl,SkillStatusChangeTable[skillid],skilllv,0,0,0,skill_get_time(skillid,skilllv),0 ); break; case MC_CHANGECART: