From d4408049c3764f3fccef3fb25b3032bebcad2f59 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 Apr 2019 02:09:18 +0300
Subject: Imporve packet ZC_ROLE_CHANGE usage

---
 src/map/clif.c           | 26 +++++++++++++++-----------
 src/map/clif.h           |  1 +
 src/map/packets_struct.h |  7 +++++++
 3 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/map/clif.c b/src/map/clif.c
index c7157f891..43407af10 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4311,22 +4311,25 @@ static void clif_addchat(struct chat_data *cd, struct map_session_data *sd)
 /// role:
 ///     0 = owner (menu)
 ///     1 = normal
-static void clif_changechatowner(struct chat_data *cd, struct map_session_data *sd)
+static void clif_chatRoleChange(struct chat_data *cd, struct map_session_data *sd, struct block_list* bl, int isNotOwner)
 {
-	unsigned char buf[64];
-
 	nullpo_retv(sd);
-	nullpo_retv(cd);
+	nullpo_retv(bl);
+	struct PACKET_ZC_ROLE_CHANGE p;
 
-	WBUFW(buf, 0) = 0xe1;
-	WBUFL(buf, 2) = 1;
-	memcpy(WBUFP(buf,6),cd->usersd[0]->status.name,NAME_LENGTH);
+	p.packetType = HEADER_ZC_ROLE_CHANGE;
+	p.flag = isNotOwner;
+	memcpy(&p.name, sd->status.name, NAME_LENGTH);
+	clif->send(&p, sizeof(struct PACKET_ZC_ROLE_CHANGE), bl, CHAT);
+}
 
-	WBUFW(buf,30) = 0xe1;
-	WBUFL(buf,32) = 0;
-	memcpy(WBUFP(buf,36),sd->status.name,NAME_LENGTH);
+static void clif_changechatowner(struct chat_data *cd, struct map_session_data *sd)
+{
+	nullpo_retv(sd);
+	nullpo_retv(cd);
 
-	clif->send(buf,packet_len(0xe1)*2,&sd->bl,CHAT);
+	clif->chatRoleChange(cd, cd->usersd[0], &sd->bl, 1);
+	clif->chatRoleChange(cd, sd, &sd->bl, 0);
 }
 
 /// Notify about user leaving the chatroom (ZC_MEMBER_EXIT).
@@ -23051,6 +23054,7 @@ void clif_defaults(void)
 	clif->joinchatok = clif_joinchatok;
 	clif->addchat = clif_addchat;
 	clif->changechatowner = clif_changechatowner;
+	clif->chatRoleChange = clif_chatRoleChange;
 	clif->clearchat = clif_clearchat;
 	clif->leavechat = clif_leavechat;
 	clif->changechatstatus = clif_changechatstatus;
diff --git a/src/map/clif.h b/src/map/clif.h
index 23cdf28f6..1f3f39874 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -998,6 +998,7 @@ struct clif_interface {
 	void (*joinchatok) (struct map_session_data *sd,struct chat_data* cd);
 	void (*addchat) (struct chat_data* cd,struct map_session_data *sd);
 	void (*changechatowner) (struct chat_data* cd, struct map_session_data* sd);
+	void (*chatRoleChange) (struct chat_data *cd, struct map_session_data *sd, struct block_list* bl, int isNotOwner);
 	void (*clearchat) (struct chat_data *cd,int fd);
 	void (*leavechat) (struct chat_data* cd, struct map_session_data* sd, bool flag);
 	void (*changechatstatus) (struct chat_data* cd);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index d61434603..55d21f6b0 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3227,6 +3227,13 @@ struct PACKET_ZC_PARTY_CONFIG {
 DEFINE_PACKET_HEADER(ZC_PARTY_CONFIG, 0x02c9);
 #endif
 
+struct PACKET_ZC_ROLE_CHANGE {
+	int16 packetType;
+	int32 flag;
+	char name[NAME_LENGTH];
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_ROLE_CHANGE, 0x00e1);
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2