Remove round-trip to the inter-server for the guild chat messages

Signed-off-by: Haru <haru@dotalux.com>

8 files changed, 7 insertions, 80 deletions

diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 8e05c76e2..87cb3bee0 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -1612,7 +1612,6 @@ static int inter_guild_parse_frommap(int fd)
 	case 0x3034: mapif->parse_GuildLeave(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOB(fd,14), RFIFOP(fd,15)); break;
 	case 0x3035: mapif->parse_GuildChangeMemberInfoShort(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOL(fd,15),RFIFOL(fd,19)); break;
 	case 0x3036: mapif->parse_BreakGuild(fd,RFIFOL(fd,2)); break;
-	case 0x3037: mapif->parse_GuildMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12), RFIFOW(fd,2)-12); break;
 	case 0x3039: mapif->parse_GuildBasicInfoChange(fd, RFIFOL(fd,4), RFIFOW(fd,8), RFIFOP(fd,10), RFIFOW(fd,2)-10); break;
 	case 0x303A: mapif->parse_GuildMemberInfoChange(fd, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOL(fd,12), RFIFOW(fd,16), RFIFOP(fd,18), RFIFOW(fd,2)-18); break;
 	case 0x303B: mapif->parse_GuildPosition(fd, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12)); break;
diff --git a/src/char/inter.c b/src/char/inter.c
index d6b96f020..264327289 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -70,7 +70,7 @@ static int inter_recv_packet_length[] = {
 	 0, 0, 0, 0, -1,13,36, (2 + 4 + 4 + 4 + NAME_LENGTH),  0, 0, 0, 0,  0, 0,  0, 0, // 3000-
 	 6,-1, 6,-1,  0, 0, 0, 0, 10,-1, 0, 0,  0, 0,  0, 0,    // 3010- Account Storage, Achievements [Smokexyz]
 	-1,10,-1,14, 14,19, 6, 0, 14,14, 0, 0,  0, 0,  0, 0,    // 3020- Party
-	-1, 6,-1,-1, 55,23, 6,-1, 14,-1,-1,-1, 18,19,186,-1,    // 3030-
+	-1, 6,-1,-1, 55,23, 6, 0, 14,-1,-1,-1, 18,19,186,-1,    // 3030-
 	-1, 9, 0, 0, 10,10, 0, 0,  7, 6,10,10, 10,-1,  0, 0,    // 3040- Clan System(3044-3045)
 	-1,-1,10,10,  0,-1,12, 0,  0, 0, 0, 0,  0, 0,  0, 0,    // 3050-  Auction System [Zephyrus], Item Bound [Mhalicot]
 	 6,-1, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,    // 3060-  Quest system [Kevin] [Inkfish]
diff --git a/src/char/mapif.c b/src/char/mapif.c
index 1f27c1c60..29be4eaa2 100644
--- a/src/char/mapif.c
+++ b/src/char/mapif.c
@@ -596,22 +596,6 @@ static int mapif_guild_broken(int guild_id, int flag)
 	return 0;
 }
 
-// Send guild message
-static int mapif_guild_message(int guild_id, int account_id, const char *mes, int len, int sfd)
-{
-	unsigned char buf[512];
-	nullpo_ret(mes);
-	if (len > 500)
-		len = 500;
-	WBUFW(buf, 0) = 0x3837;
-	WBUFW(buf, 2) = len + 12;
-	WBUFL(buf, 4) = guild_id;
-	WBUFL(buf, 8) = account_id;
-	memcpy(WBUFP(buf, 12), mes, len);
-	mapif->sendallwos(sfd, buf, len + 12);
-	return 0;
-}
-
 // Send basic info
 static int mapif_guild_basicinfochanged(int guild_id, int type, const void *data, int len)
 {
@@ -810,12 +794,6 @@ static int mapif_parse_BreakGuild(int fd, int guild_id)
 	return 0;
 }
 
-// Forward Guild message to others map servers
-static int mapif_parse_GuildMessage(int fd, int guild_id, int account_id, const char *mes, int len)
-{
-	return mapif->guild_message(guild_id,account_id,mes,len, fd);
-}
-
 /**
  * Changes basic guild information
  * The types are available in mmo.h::guild_basic_info
@@ -2368,7 +2346,6 @@ void mapif_defaults(void)
 	mapif->guild_withdraw = mapif_guild_withdraw;
 	mapif->guild_memberinfoshort = mapif_guild_memberinfoshort;
 	mapif->guild_broken = mapif_guild_broken;
-	mapif->guild_message = mapif_guild_message;
 	mapif->guild_basicinfochanged = mapif_guild_basicinfochanged;
 	mapif->guild_memberinfochanged = mapif_guild_memberinfochanged;
 	mapif->guild_skillupack = mapif_guild_skillupack;
@@ -2384,7 +2361,6 @@ void mapif_defaults(void)
 	mapif->parse_GuildLeave = mapif_parse_GuildLeave;
 	mapif->parse_GuildChangeMemberInfoShort = mapif_parse_GuildChangeMemberInfoShort;
 	mapif->parse_BreakGuild = mapif_parse_BreakGuild;
-	mapif->parse_GuildMessage = mapif_parse_GuildMessage;
 	mapif->parse_GuildBasicInfoChange = mapif_parse_GuildBasicInfoChange;
 	mapif->parse_GuildMemberInfoChange = mapif_parse_GuildMemberInfoChange;
 	mapif->parse_GuildPosition = mapif_parse_GuildPosition;
diff --git a/src/char/mapif.h b/src/char/mapif.h
index f61b5a9d7..f5b54b6b7 100644
--- a/src/char/mapif.h
+++ b/src/char/mapif.h
@@ -70,7 +70,6 @@ struct mapif_interface {
 	int (*guild_withdraw) (int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes);
 	int (*guild_memberinfoshort) (struct guild *g, int idx);
 	int (*guild_broken) (int guild_id, int flag);
-	int (*guild_message) (int guild_id, int account_id, const char *mes, int len, int sfd);
 	int (*guild_basicinfochanged) (int guild_id, int type, const void *data, int len);
 	int (*guild_memberinfochanged) (int guild_id, int account_id, int char_id, int type, const void *data, int len);
 	int (*guild_skillupack) (int guild_id, uint16 skill_id, int account_id);
@@ -86,7 +85,6 @@ struct mapif_interface {
 	int (*parse_GuildLeave) (int fd, int guild_id, int account_id, int char_id, int flag, const char *mes);
 	int (*parse_GuildChangeMemberInfoShort) (int fd, int guild_id, int account_id, int char_id, int online, int lv, int class);
 	int (*parse_BreakGuild) (int fd, int guild_id);
-	int (*parse_GuildMessage) (int fd, int guild_id, int account_id, const char *mes, int len);
 	int (*parse_GuildBasicInfoChange) (int fd, int guild_id, int type, const void *data, int len);
 	int (*parse_GuildMemberInfoChange) (int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len);
 	int (*parse_GuildPosition) (int fd, int guild_id, int idx, const struct guild_position *p);
diff --git a/src/map/guild.c b/src/map/guild.c
index aadb55c78..415a46db5 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1137,13 +1137,14 @@ static int guild_recv_memberinfoshort(int guild_id, int account_id, int char_id,
  *---------------------------------------------------*/
 static int guild_send_message(struct map_session_data *sd, const char *mes)
 {
-	int len = (int)strlen(mes);
 	nullpo_ret(sd);
 
-	if (sd->status.guild_id == 0)
+	if (sd->status.guild_id == 0 || sd->guild == NULL)
 		return 0;
-	intif->guild_message(sd->status.guild_id, sd->status.account_id, mes, len);
-	guild->recv_message(sd->status.guild_id, sd->status.account_id, mes, len);
+
+	int len = (int)strlen(mes);
+
+	clif->guild_message(sd->guild, sd->status.account_id, mes, len);
 
 	// Chat logging type 'G' / Guild Chat
 	logs->chat(LOG_CHAT_GUILD, sd->status.guild_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes);
@@ -1152,18 +1153,6 @@ static int guild_send_message(struct map_session_data *sd, const char *mes)
 }
 
 /*====================================================
- * Guild receive a message, will be displayed to whole member
- *---------------------------------------------------*/
-static int guild_recv_message(int guild_id, int account_id, const char *mes, int len)
-{
-	struct guild *g;
-	if( (g=guild->search(guild_id))==NULL)
-		return 0;
-	clif->guild_message(g,account_id,mes,len);
-	return 0;
-}
-
-/*====================================================
  * Member changing position in guild
  *---------------------------------------------------*/
 static int guild_change_memberposition(int guild_id, int account_id, int char_id, short idx)
@@ -2480,7 +2469,6 @@ void guild_defaults(void)
 	guild->change_emblem = guild_change_emblem;
 	guild->emblem_changed = guild_emblem_changed;
 	guild->send_message = guild_send_message;
-	guild->recv_message = guild_recv_message;
 	guild->send_dot_remove = guild_send_dot_remove;
 	guild->skillupack = guild_skillupack;
 	guild->dobreak = guild_break;
diff --git a/src/map/guild.h b/src/map/guild.h
index 40209b988..d0374103f 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -136,7 +136,6 @@ struct guild_interface {
 	int (*change_emblem) (struct map_session_data *sd,int len,const char *data);
 	int (*emblem_changed) (int len,int guild_id,int emblem_id,const char *data);
 	int (*send_message) (struct map_session_data *sd, const char *mes);
-	int (*recv_message) (int guild_id,int account_id,const char *mes,int len);
 	int (*send_dot_remove) (struct map_session_data *sd);
 	int (*skillupack) (int guild_id,uint16 skill_id,int account_id);
 	int (*dobreak) (struct map_session_data *sd, const char *name);
diff --git a/src/map/intif.c b/src/map/intif.c
index 412cd78f8..5a62f9644 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -758,28 +758,6 @@ static int intif_guild_break(int guild_id)
 	return 0;
 }
 
-// Send a guild message
-static int intif_guild_message(int guild_id, int account_id, const char *mes, int len)
-{
-	if (intif->CheckForCharServer())
-		return 0;
-
-	if (chrif->other_mapserver_count < 1)
-		return 0; //No need to send.
-
-	nullpo_ret(mes);
-	Assert_ret(len > 0 && len < 32000);
-	WFIFOHEAD(inter_fd, len + 12);
-	WFIFOW(inter_fd,0)=0x3037;
-	WFIFOW(inter_fd,2)=len+12;
-	WFIFOL(inter_fd,4)=guild_id;
-	WFIFOL(inter_fd,8)=account_id;
-	memcpy(WFIFOP(inter_fd,12),mes,len);
-	WFIFOSET(inter_fd,len+12);
-
-	return 0;
-}
-
 /**
  * Requests to change a basic guild information, it is parsed via mapif_parse_GuildBasicInfoChange
  * To see the information types that can be changed see mmo.h::guild_basic_info
@@ -1348,12 +1326,6 @@ static void intif_parse_GuildEmblem(int fd)
 	guild->emblem_changed(RFIFOW(fd,2)-12, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12));
 }
 
-// ACK guild message
-static void intif_parse_GuildMessage(int fd)
-{
-	guild->recv_message(RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12), RFIFOW(fd,2)-12);
-}
-
 // Reply guild castle data request
 static void intif_parse_GuildCastleDataLoad(int fd)
 {
@@ -2665,7 +2637,6 @@ static int intif_parse(int fd)
 		case 0x3834: intif->pGuildMemberWithdraw(fd); break;
 		case 0x3835: intif->pGuildMemberInfoShort(fd); break;
 		case 0x3836: intif->pGuildBroken(fd); break;
-		case 0x3837: intif->pGuildMessage(fd); break;
 		case 0x3839: intif->pGuildBasicInfoChanged(fd); break;
 		case 0x383a: intif->pGuildMemberInfoChanged(fd); break;
 		case 0x383b: intif->pGuildPosition(fd); break;
@@ -2750,7 +2721,7 @@ void intif_defaults(void)
 		 0, 0, 0, 0, -1,-1,37,-1,  7, 0, 0, 0,  0, 0,  0, 0, //0x3800-0x380f
 		-1, 0, 0, 0,  0, 0, 0, 0, -1,11, 0, 0,  0, 0,  0, 0, //0x3810 Achievements [Smokexyz/Hercules]
 		39,-1,15,15, 14,19, 7, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3820
-		10,-1,15, 0, 79,25, 7,-1,  0,-1,-1,-1, 14,67,186,-1, //0x3830
+		10,-1,15, 0, 79,25, 7, 0,  0,-1,-1,-1, 14,67,186,-1, //0x3830
 		-1, 0, 0,14,  0, 0, 0, 0, -1,74,-1,11, 11,-1,  0, 0, //0x3840
 		-1,-1, 7, 7,  7,11, 8, 0, 10, 0, 0, 0,  0, 0,  0, 0, //0x3850  Auctions [Zephyrus] itembound[Akinari] Clan System[Murilo BiO]
 		-1, 7, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3860  Quests [Kevin] [Inkfish]
@@ -2787,7 +2758,6 @@ void intif_defaults(void)
 	intif->guild_leave = intif_guild_leave;
 	intif->guild_memberinfoshort = intif_guild_memberinfoshort;
 	intif->guild_break = intif_guild_break;
-	intif->guild_message = intif_guild_message;
 	intif->guild_change_gm = intif_guild_change_gm;
 	intif->guild_change_basicinfo = intif_guild_change_basicinfo;
 	intif->guild_change_memberinfo = intif_guild_change_memberinfo;
@@ -2871,7 +2841,6 @@ void intif_defaults(void)
 	intif->pGuildMemberWithdraw = intif_parse_GuildMemberWithdraw;
 	intif->pGuildMemberInfoShort = intif_parse_GuildMemberInfoShort;
 	intif->pGuildBroken = intif_parse_GuildBroken;
-	intif->pGuildMessage = intif_parse_GuildMessage;
 	intif->pGuildBasicInfoChanged = intif_parse_GuildBasicInfoChanged;
 	intif->pGuildMemberInfoChanged = intif_parse_GuildMemberInfoChanged;
 	intif->pGuildPosition = intif_parse_GuildPosition;
diff --git a/src/map/intif.h b/src/map/intif.h
index f5f013db9..ffac4a1c9 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -80,7 +80,6 @@ struct intif_interface {
 	int (*guild_leave) (int guild_id, int account_id, int char_id, int flag, const char *mes);
 	int (*guild_memberinfoshort) (int guild_id, int account_id, int char_id, int online, int lv, int class);
 	int (*guild_break) (int guild_id);
-	int (*guild_message) (int guild_id, int account_id, const char *mes, int len);
 	int (*guild_change_gm) (int guild_id, const char *name, int len);
 	int (*guild_change_basicinfo) (int guild_id, int type, const void *data, int len);
 	int (*guild_change_memberinfo) (int guild_id, int account_id, int char_id, int type, const void *data, int len);
@@ -165,7 +164,6 @@ struct intif_interface {
 	void (*pGuildMemberWithdraw) (int fd);
 	void (*pGuildMemberInfoShort) (int fd);
 	void (*pGuildBroken) (int fd);
-	void (*pGuildMessage) (int fd);
 	void (*pGuildBasicInfoChanged) (int fd);
 	void (*pGuildMemberInfoChanged) (int fd);
 	void (*pGuildPosition) (int fd);