- Reverted the dup-label check code since it has a bug that needs to be fixed first (it fails to recognize const.txt values)

- Reverted clif_skill_damage receiving the blewcount value since the whole code update that was involved didn't help any anyway.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9675 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 22 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index a7988b0f1..30cb33bfc 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4429,7 +4429,7 @@ int clif_skill_fail(struct map_session_data *sd,int skill_id,int type,int btype)
  *------------------------------------------
  */
 int clif_skill_damage(struct block_list *src,struct block_list *dst,
-	unsigned int tick,int sdelay,int ddelay,int damage,int div,int skill_id,int skill_lv,int type,int flag)
+	unsigned int tick,int sdelay,int ddelay,int damage,int div,int skill_id,int skill_lv,int type)
 {
 	unsigned char buf[64];
 	struct status_change *sc;
@@ -4454,21 +4454,13 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,
 	WBUFL(buf,12)=tick;
 	WBUFL(buf,16)=sdelay;
 	WBUFL(buf,20)=ddelay;
-	WBUFW(buf,26)=skill_lv;
-	WBUFW(buf,28)=div;
-#if 0
-	if (flag && dst->type == BL_PC)
-	{	//Needed for appropiate knockback on the receiving client.
-		WBUFW(buf,24)=-30000;
-		WBUFB(buf,30)=6;
-		clif_send(buf,packet_len(0x114),dst,SELF);
-	}
-#endif
 	if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
 		WBUFW(buf,24)=damage?div:0;
 	} else {
 		WBUFW(buf,24)=damage;
 	}
+	WBUFW(buf,26)=skill_lv;
+	WBUFW(buf,28)=div;
 	WBUFB(buf,30)=type;
 	clif_send(buf,packet_len(0x114),src,AREA);
 	if(disguised(src)) {
@@ -4493,21 +4485,13 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,
 	WBUFL(buf,12)=tick;
 	WBUFL(buf,16)=sdelay;
 	WBUFL(buf,20)=ddelay;
-	WBUFW(buf,28)=skill_lv;
-	WBUFW(buf,30)=div;
-#if 0
-	if (flag && dst->type == BL_PC)
-	{	//Needed for appropiate knockback on the receiving client.
-		WBUFL(buf,24)=-30000;
-		WBUFB(buf,32)=6;
-		clif_send(buf,packet_len(0x114),dst,SELF);
-	}
-#endif
 	if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
 		WBUFL(buf,24)=damage?div:0;
 	} else {
 		WBUFL(buf,24)=damage;
 	}
+	WBUFW(buf,28)=skill_lv;
+	WBUFW(buf,30)=div;
 	WBUFB(buf,32)=type;
 	clif_send(buf,packet_len(0x1de),src,AREA);
 	if(disguised(src)) {
@@ -8140,7 +8124,6 @@ void clif_parse_WantToConnection(int fd, TBL_PC* sd)
 	{// packet version accepted
 		TBL_PC* old_sd;
 		struct block_list* bl;
-
 		if( (bl=map_id2bl(account_id)) != NULL && bl->type != BL_PC )
 		{// non-player object already has that id
 			ShowError("clif_parse_WantToConnection: a non-player object already has id %d, please increase the starting account number\n", account_id);