Pārlūkot izejas kodu

* Corrected clif_sitting stuff.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@101 54d463be-8e91-2dee-dedb-b68131a5f0ec
spira 20 gadi atpakaļ
vecāks
revīzija
aa2c330841
4 mainītis faili ar 11 papildinājumiem un 10 dzēšanām
  1. 1 0
      Changelog.txt
  2. 8 8
      src/map/clif.c
  3. 1 1
      src/map/clif.h
  4. 1 1
      src/map/skill.c

+ 1 - 0
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]

+ 8 - 8
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) 
 {
-	nullpo_retv(sd);
+	unsigned char buf[64];
 
-	fd=sd->fd;
+	nullpo_retv(sd);
 
-	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;

+ 1 - 1
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);

+ 1 - 1
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:	/* ƒeƒ“ƒVƒ‡ƒ“ƒŠƒ‰ƒbƒNƒX */
 		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: