Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted ZC_ACK_GUILD_MENUINTERFACE to struct (#8627)

Browse Source 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
AoShinHo 2024-09-14 19:29:05 -03:00 committed by GitHub
parent f3d1541e44
commit 82a0c503ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/map/clif.cpp
View File

@ -8691,8 +8691,8 @@ void clif_guild_send_onlineinfo(map_session_data *sd)
}
/// Bitmask of enabled guild window tabs (ZC_ACK_GUILD_MENUINTERFACE).
/// 014e <menu flag>.L
/// Bitmask of enabled guild window tabs
/// 014e <menu flag>.L (ZC_ACK_GUILD_MENUINTERFACE)
/// menu flag:
/// 0x00 = Basic Info (always on)
/// &0x01 = Member manager
@ -8701,17 +8701,18 @@ void clif_guild_send_onlineinfo(map_session_data *sd)
/// &0x10 = Expulsion list
/// &0x40 = Unknown (GMENUFLAG_ALLGUILDLIST)
/// &0x80 = Notice
void clif_guild_masterormember(map_session_data *sd)
{
int fd;
void clif_guild_masterormember(map_session_data& sd){
nullpo_retv(sd);
PACKET_ZC_ACK_GUILD_MENUINTERFACE p{};
fd=sd->fd;
WFIFOHEAD(fd,packet_len(0x14e));
WFIFOW(fd,0) = 0x14e;
WFIFOL(fd,2) = (sd->state.gmaster_flag) ? 0xd7 : 0x57;
WFIFOSET(fd,packet_len(0x14e));
p.packetType = HEADER_ZC_ACK_GUILD_MENUINTERFACE;
if(sd.state.gmaster_flag){
p.menuFlag = 0xd7;
}else{
p.menuFlag = 0x57;
}
clif_send(&p,sizeof(p),&sd.bl,SELF);
}
@ -14069,11 +14070,13 @@ void clif_parse_CreateGuild(int fd,map_session_data *sd){
}
/// Request for guild window interface permissions (CZ_REQ_GUILD_MENUINTERFACE).
/// 014d
void clif_parse_GuildCheckMaster(int fd, map_session_data *sd)
{
clif_guild_masterormember(sd);
/// Request for guild window interface permissions
/// 014d (CZ_REQ_GUILD_MENUINTERFACE)
static void clif_parse_GuildCheckMaster(int fd, map_session_data *sd){
if(sd == nullptr)
return;
clif_guild_masterormember(*sd);
}

2
src/map/clif.hpp
View File

@ -1041,7 +1041,7 @@ void clif_party_dead( map_session_data& sd );
// guild
void clif_guild_created( map_session_data& sd, int flag );
void clif_guild_belonginfo( map_session_data& sd );
void clif_guild_masterormember(map_session_data *sd);
void clif_guild_masterormember(map_session_data& sd);
void clif_guild_basicinfo( map_session_data& sd );
void clif_guild_allianceinfo(map_session_data& sd);
void clif_guild_memberlist( map_session_data& sd );

1
src/map/clif_packetdb.hpp
View File

@ -162,7 +162,6 @@
packet(0x014a,6);
packet(0x014b,27);
parseable_packet(0x014d,2,clif_parse_GuildCheckMaster,0);
packet(0x014e,6);
parseable_packet(0x014f,6,clif_parse_GuildRequestInfo,2);
packet(0x0150,110);
parseable_packet(0x0151,6,clif_parse_GuildRequestEmblem,2);

2
src/map/guild.cpp
View File

@ -847,7 +847,7 @@ int guild_recv_info(const struct mmo_guild &sg) {
sd->guild = g;
sd->state.gmaster_flag = 1;
clif_name_area(&sd->bl); // [LuzZza]
clif_guild_masterormember(sd);
clif_guild_masterormember(*sd);
}
} else {
before = g->guild;

6
src/map/packets.hpp
View File

@ -817,6 +817,12 @@ struct PACKET_ZC_CARTOFF {
} __attribute__((packed));
DEFINE_PACKET_HEADER(ZC_CARTOFF, 0x12b)
struct PACKET_ZC_ACK_GUILD_MENUINTERFACE {
int16 packetType;
int menuFlag;
} __attribute__((packed));
DEFINE_PACKET_HEADER(ZC_ACK_GUILD_MENUINTERFACE, 0x014e)
struct PACKET_ZC_NOTIFY_POSITION_TO_GUILDM {
int16 packetType;
uint32 aid;