summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-12-16 07:11:15 +0300
committerAndrei Karas <akaras@inbox.ru>2018-12-16 07:11:15 +0300
commit69c9054622594092f0449d92c526d6e9db71d5f3 (patch)
tree4d046254d4a8886045581f4f84d31bc6eba79f7e
parent46521f31fd6b4e7a621cfce4d68bf99278374d33 (diff)
downloadhercules-69c9054622594092f0449d92c526d6e9db71d5f3.tar.gz
hercules-69c9054622594092f0449d92c526d6e9db71d5f3.tar.bz2
hercules-69c9054622594092f0449d92c526d6e9db71d5f3.tar.xz
hercules-69c9054622594092f0449d92c526d6e9db71d5f3.zip
Fix and update packet CZ_PARTY_CONFIG.
-rw-r--r--src/map/clif.c12
-rw-r--r--src/map/packets_struct.h6
2 files changed, 12 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index fd3c01168..9166c83ea 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7136,7 +7136,7 @@ static void clif_partyinvitationstate(struct map_session_data *sd)
WFIFOHEAD(fd, packet_len(0x2c9));
WFIFOW(fd, 0) = 0x2c9;
- WFIFOB(fd, 2) = sd->status.allow_party ? 1 : 0;
+ WFIFOB(fd, 2) = sd->status.allow_party ? 0 : 1;
WFIFOSET(fd, packet_len(0x2c9));
}
@@ -17002,13 +17002,13 @@ static void clif_parse_cz_config(int fd, struct map_session_data *sd)
static void clif_parse_PartyTick(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
/// Request to change party invitation tick.
/// value:
-/// 0 = disabled
-/// 1 = enabled
+/// 0 = enabled
+/// 1 = disabled
static void clif_parse_PartyTick(int fd, struct map_session_data *sd)
{
- bool flag = RFIFOB(fd,6)?true:false;
- sd->status.allow_party = flag;
- clif->partytickack(sd, flag);
+ const struct PACKET_CZ_PARTY_CONFIG *const p = RFIFOP(fd, 0);
+ sd->status.allow_party = p->refuseInvite ? false : true;
+ clif->partytickack(sd, sd->status.allow_party);
}
/// Questlog System [Kevin] [Inkfish]
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 95bf65b6d..f9b5fab0d 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3051,6 +3051,12 @@ struct PACKET_CZ_REQ_REMAINTIME {
} __attribute__((packed));
DEFINE_PACKET_HEADER(CZ_REQ_REMAINTIME, 0x01c0);
+struct PACKET_CZ_PARTY_CONFIG {
+ int16 packetType;
+ uint8 refuseInvite;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_PARTY_CONFIG, 0x02c8);
+
#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