summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-12-19 07:10:52 +0300
committerAndrei Karas <akaras@inbox.ru>2019-01-14 20:18:10 +0300
commitc3f336667cf2a1d51f28ffae47631ca6f2937f64 (patch)
tree49513fad8fbcb4371e4cdb12da0e50c4ea76faa8
parent8cbe11afe437388c71ca79132d06048cd4305368 (diff)
downloadhercules-c3f336667cf2a1d51f28ffae47631ca6f2937f64.tar.gz
hercules-c3f336667cf2a1d51f28ffae47631ca6f2937f64.tar.bz2
hercules-c3f336667cf2a1d51f28ffae47631ca6f2937f64.tar.xz
hercules-c3f336667cf2a1d51f28ffae47631ca6f2937f64.zip
Add inventory expansion packets to main and re clients with version 20181219
-rw-r--r--src/common/mmo.h4
-rw-r--r--src/map/clif.c6
-rw-r--r--src/map/packets_struct.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 4b8f49fa2..c29da580c 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -166,11 +166,11 @@
#define MAX_CARTS (MAX_BASE_CARTS + MAX_CARTDECORATION_CARTS)
#ifndef MAX_INVENTORY
-#if PACKETVER_ZERO_NUM >= 20181212
+#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
#define MAX_INVENTORY 200
#else
#define MAX_INVENTORY 100
-#endif // PACKETVER_ZERO_NUM >= 20181212
+#endif // PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
#endif // MAX_INVENTORY
#ifndef FIXED_INVENTORY_SIZE
diff --git a/src/map/clif.c b/src/map/clif.c
index 28b953de5..c25f5a9af 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3079,7 +3079,7 @@ static void clif_cartItems(struct map_session_data *sd, enum inventory_type type
static void clif_inventoryExpansionInfo(struct map_session_data *sd)
{
-#if PACKETVER_ZERO_NUM >= 20181212
+#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
nullpo_retv(sd);
const int fd = sd->fd;
@@ -3093,7 +3093,7 @@ static void clif_inventoryExpansionInfo(struct map_session_data *sd)
static void clif_inventoryExpandAck(struct map_session_data *sd, enum expand_inventory result, int itemId)
{
-#if PACKETVER_ZERO_NUM >= 20181212
+#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
nullpo_retv(sd);
const int fd = sd->fd;
@@ -3108,7 +3108,7 @@ static void clif_inventoryExpandAck(struct map_session_data *sd, enum expand_inv
static void clif_inventoryExpandResult(struct map_session_data *sd, enum expand_inventory_result result)
{
-#if PACKETVER_ZERO_NUM >= 20181212
+#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
nullpo_retv(sd);
const int fd = sd->fd;
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index d648d262e..d12c8c6e1 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3000,7 +3000,7 @@ struct PACKET_CZ_STOP_USE_SKILL {
DEFINE_PACKET_HEADER(CZ_STOP_USE_SKILL, 0x0b11);
#endif
-#if PACKETVER_ZERO_NUM >= 20181212
+#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
struct PACKET_ZC_INVENTORY_EXPANSION_INFO {
int16 packetType;
int16 expansionSize;
@@ -3008,7 +3008,7 @@ struct PACKET_ZC_INVENTORY_EXPANSION_INFO {
DEFINE_PACKET_HEADER(ZC_INVENTORY_EXPANSION_INFO, 0x0b18);
#endif
-#if PACKETVER_ZERO_NUM >= 20181212
+#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
struct PACKET_ZC_ACK_INVENTORY_EXPAND {
int16 packetType;
uint8 result;
@@ -3017,7 +3017,7 @@ struct PACKET_ZC_ACK_INVENTORY_EXPAND {
DEFINE_PACKET_HEADER(ZC_ACK_INVENTORY_EXPAND, 0x0b15);
#endif
-#if PACKETVER_ZERO_NUM >= 20181212
+#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212
struct PACKET_ZC_ACK_INVENTORY_EXPAND_RESULT {
int16 packetType;
uint8 result;