1 files changed, 17 insertions, 15 deletions

diff --git a/src/map/duel.c b/src/map/duel.c
index c13d004b0..7af427304 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/cbasetypes.h"
 
@@ -52,7 +53,7 @@ static int duel_showinfo_sub(struct map_session_data* sd, va_list va)
 	if (sd->duel_group != ssd->duel_group) return 0;
 	
 	sprintf(output, "      %d. %s", ++(*p), sd->status.name);
-	clif_disp_onlyself(ssd, output, strlen(output));
+	clif->disp_onlyself(ssd, output, strlen(output));
 	return 1;
 }
 
@@ -73,7 +74,7 @@ void duel_showinfo(const unsigned int did, struct map_session_data* sd)
 			duel_list[did].members_count,
 			duel_list[did].members_count + duel_list[did].invites_count);
 
-	clif_disp_onlyself(sd, output, strlen(output));
+	clif->disp_onlyself(sd, output, strlen(output));
 	map_foreachpc(duel_showinfo_sub, sd, &p);
 }
 
@@ -92,10 +93,10 @@ int duel_create(struct map_session_data* sd, const unsigned int maxpl)
 	duel_list[i].max_players_limit = maxpl;
 	
 	strcpy(output, msg_txt(372)); // " -- Duel has been created (@invite/@leave) --"
-	clif_disp_onlyself(sd, output, strlen(output));
+	clif->disp_onlyself(sd, output, strlen(output));
 	
-	clif_map_property(sd, MAPPROPERTY_FREEPVPZONE);
-	//clif_misceffect2(&sd->bl, 159);
+	clif->map_property(sd, MAPPROPERTY_FREEPVPZONE);
+	clif->maptypeproperty2(&sd->bl,SELF);
 	return i;
 }
 
@@ -105,14 +106,14 @@ void duel_invite(const unsigned int did, struct map_session_data* sd, struct map
 
 	// " -- Player %s invites %s to duel --"
 	sprintf(output, msg_txt(373), sd->status.name, target_sd->status.name);
-	clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
+	clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
 
 	target_sd->duel_invite = did;
 	duel_list[did].invites_count++;
 	
 	// "Blue -- Player %s invites you to PVP duel (@accept/@reject) --"
 	sprintf(output, msg_txt(374), sd->status.name);
-	clif_broadcast((struct block_list *)target_sd, output, strlen(output)+1, 0x10, SELF);
+	clif->broadcast((struct block_list *)target_sd, output, strlen(output)+1, 0x10, SELF);
 }
 
 static int duel_leave_sub(struct map_session_data* sd, va_list va)
@@ -129,7 +130,7 @@ void duel_leave(const unsigned int did, struct map_session_data* sd)
 	
 	// " <- Player %s has left duel --"
 	sprintf(output, msg_txt(375), sd->status.name);
-	clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
+	clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
 	
 	duel_list[did].members_count--;
 	
@@ -140,7 +141,8 @@ void duel_leave(const unsigned int did, struct map_session_data* sd)
 	
 	sd->duel_group = 0;
 	duel_savetime(sd);
-	clif_map_property(sd, MAPPROPERTY_NOTHING);
+	clif->map_property(sd, MAPPROPERTY_NOTHING);
+	clif->maptypeproperty2(&sd->bl,SELF);
 }
 
 void duel_accept(const unsigned int did, struct map_session_data* sd)
@@ -154,10 +156,10 @@ void duel_accept(const unsigned int did, struct map_session_data* sd)
 	
 	// " -> Player %s has accepted duel --"
 	sprintf(output, msg_txt(376), sd->status.name);
-	clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
+	clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
 
-	clif_map_property(sd, MAPPROPERTY_FREEPVPZONE);
-	//clif_misceffect2(&sd->bl, 159);
+	clif->map_property(sd, MAPPROPERTY_FREEPVPZONE);
+	clif->maptypeproperty2(&sd->bl,SELF);
 }
 
 void duel_reject(const unsigned int did, struct map_session_data* sd)
@@ -166,7 +168,7 @@ void duel_reject(const unsigned int did, struct map_session_data* sd)
 	
 	// " -- Player %s has rejected duel --"
 	sprintf(output, msg_txt(377), sd->status.name);
-	clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
+	clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
 	
 	duel_list[did].invites_count--;
 	sd->duel_invite = 0;