Rewrite inter server messaging
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@740 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
@@ -902,7 +902,7 @@ int mapif_guild_broken(int guild_id,int flag)
|
||||
}
|
||||
|
||||
// ギルド内発言
|
||||
int mapif_guild_message(int guild_id,int account_id,char *mes,int len)
|
||||
int mapif_guild_message(int guild_id,int account_id,char *mes,int len, int sfd)
|
||||
{
|
||||
unsigned char buf[512];
|
||||
WBUFW(buf,0)=0x3837;
|
||||
@@ -910,7 +910,7 @@ int mapif_guild_message(int guild_id,int account_id,char *mes,int len)
|
||||
WBUFL(buf,4)=guild_id;
|
||||
WBUFL(buf,8)=account_id;
|
||||
memcpy(WBUFP(buf,12),mes,len);
|
||||
mapif_sendall(buf,len+12);
|
||||
mapif_sendallwos(sfd, buf,len+12);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1329,7 +1329,7 @@ int mapif_parse_BreakGuild(int fd,int guild_id)
|
||||
// ギルドメッセージ送信
|
||||
int mapif_parse_GuildMessage(int fd,int guild_id,int account_id,char *mes,int len)
|
||||
{
|
||||
return mapif_guild_message(guild_id,account_id,mes,len);
|
||||
return mapif_guild_message(guild_id,account_id,mes,len, fd);
|
||||
}
|
||||
// ギルド基本データ変更要求
|
||||
int mapif_parse_GuildBasicInfoChange(int fd,int guild_id,
|
||||
|
||||
@@ -435,7 +435,7 @@ int mapif_party_broken(int party_id,int flag)
|
||||
return 0;
|
||||
}
|
||||
// パーティ内発言
|
||||
int mapif_party_message(int party_id,int account_id,char *mes,int len)
|
||||
int mapif_party_message(int party_id,int account_id,char *mes,int len, int sfd)
|
||||
{
|
||||
unsigned char buf[512];
|
||||
WBUFW(buf,0)=0x3827;
|
||||
@@ -443,7 +443,7 @@ int mapif_party_message(int party_id,int account_id,char *mes,int len)
|
||||
WBUFL(buf,4)=party_id;
|
||||
WBUFL(buf,8)=account_id;
|
||||
memcpy(WBUFP(buf,12),mes,len);
|
||||
mapif_sendall(buf,len+12);
|
||||
mapif_sendallwos(sfd, buf,len+12);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -711,7 +711,7 @@ int mapif_parse_BreakParty(int fd,int party_id)
|
||||
// パーティメッセージ送信
|
||||
int mapif_parse_PartyMessage(int fd,int party_id,int account_id,char *mes,int len)
|
||||
{
|
||||
return mapif_party_message(party_id,account_id,mes,len);
|
||||
return mapif_party_message(party_id,account_id,mes,len, fd);
|
||||
}
|
||||
// パーティチェック要求
|
||||
int mapif_parse_PartyCheck(int fd,int party_id,int account_id,char *nick)
|
||||
|
||||
@@ -306,13 +306,13 @@ int inter_mapif_init(int fd) {
|
||||
//--------------------------------------------------------
|
||||
|
||||
// GM message sending
|
||||
int mapif_GMmessage(unsigned char *mes, int len) {
|
||||
int mapif_GMmessage(unsigned char *mes, int len, int sfd) {
|
||||
unsigned char buf[len];
|
||||
|
||||
WBUFW(buf, 0) = 0x3800;
|
||||
WBUFW(buf, 2) = len;
|
||||
memcpy(WBUFP(buf, 4), mes, len-4);
|
||||
mapif_sendall(buf, len);
|
||||
mapif_sendallwos(sfd, buf, len);
|
||||
printf("\033[1;34m inter server: GM[len:%d] - '%s' \033[0m\n", len, mes);
|
||||
return 0;
|
||||
}
|
||||
@@ -414,7 +414,7 @@ int check_ttl_wisdata() {
|
||||
// GM message sending
|
||||
int mapif_parse_GMmessage(int fd)
|
||||
{
|
||||
mapif_GMmessage(RFIFOP(fd, 4), RFIFOW(fd, 2));
|
||||
mapif_GMmessage(RFIFOP(fd, 4), RFIFOW(fd, 2), fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user