From d4ec7eb2414bf0feddbd97d8c501700466f64cf2 Mon Sep 17 00:00:00 2001 From: Vincent Stumpf Date: Tue, 27 Feb 2024 16:03:07 -0800 Subject: [PATCH] Fix inventory expansion packet versions (#8148) Co-authored-by: Lemongrass3110 --- src/map/clif.cpp | 12 ++++++------ src/map/clif_packetdb.hpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/map/clif.cpp b/src/map/clif.cpp index da3cb98003..a78cee1f69 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -22715,7 +22715,7 @@ void clif_parse_stylist_close( int fd, map_session_data* sd ){ } void clif_inventory_expansion_info( map_session_data* sd ){ -#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114 +#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212 nullpo_retv( sd ); struct PACKET_ZC_EXTEND_BODYITEM_SIZE p = {}; @@ -22736,7 +22736,7 @@ enum class e_inventory_expansion_response : uint8{ }; void clif_inventory_expansion_response( map_session_data* sd, e_inventory_expansion_response response ){ -#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114 +#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212 nullpo_retv( sd ); struct PACKET_ZC_ACK_OPEN_MSGBOX_EXTEND_BODYITEM_SIZE p = {}; @@ -22750,7 +22750,7 @@ void clif_inventory_expansion_response( map_session_data* sd, e_inventory_expans } void clif_parse_inventory_expansion_request( int fd, map_session_data* sd ){ -#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114 +#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212 // Check if player is dead or busy with other stuff if( pc_isdead( sd ) || pc_cant_act( sd ) ){ clif_inventory_expansion_response( sd, e_inventory_expansion_response::BUSY ); @@ -22819,7 +22819,7 @@ enum class e_inventory_expansion_result : uint8{ }; void clif_inventory_expansion_result( map_session_data* sd, e_inventory_expansion_result result ){ -#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114 +#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212 nullpo_retv( sd ); struct PACKET_ZC_ACK_EXTEND_BODYITEM_SIZE p = {}; @@ -22836,7 +22836,7 @@ void clif_inventory_expansion_result( map_session_data* sd, e_inventory_expansio } void clif_parse_inventory_expansion_confirm( int fd, map_session_data* sd ){ -#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114 +#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212 if( sd->state.inventory_expansion_confirmation == 0 ){ return; } @@ -22887,7 +22887,7 @@ void clif_parse_inventory_expansion_confirm( int fd, map_session_data* sd ){ } void clif_parse_inventory_expansion_reject( int fd, map_session_data* sd ){ -#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114 +#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212 sd->state.inventory_expansion_confirmation = 0; sd->state.inventory_expansion_amount = 0; #endif diff --git a/src/map/clif_packetdb.hpp b/src/map/clif_packetdb.hpp index ccd1434893..e620e49379 100644 --- a/src/map/clif_packetdb.hpp +++ b/src/map/clif_packetdb.hpp @@ -2365,7 +2365,7 @@ parseable_packet( HEADER_CZ_USE_SKILL_END, sizeof( struct PACKET_CZ_USE_SKILL_END ), clif_parse_StopUseSkillToId, 0 ); #endif -#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114 +#if PACKETVER_MAIN_NUM >= 20181219 || PACKETVER_RE_NUM >= 20181219 || PACKETVER_ZERO_NUM >= 20181212 parseable_packet( HEADER_CZ_REQ_OPEN_MSGBOX_EXTEND_BODYITEM_SIZE, sizeof( struct PACKET_CZ_REQ_OPEN_MSGBOX_EXTEND_BODYITEM_SIZE ), clif_parse_inventory_expansion_request, 0 ); parseable_packet( HEADER_CZ_REQ_EXTEND_BODYITEM_SIZE, sizeof( struct PACKET_CZ_REQ_EXTEND_BODYITEM_SIZE ), clif_parse_inventory_expansion_confirm, 0 ); parseable_packet( HEADER_CZ_CLOSE_MSGBOX_EXTEND_BODYITEM_SIZE, sizeof( struct PACKET_CZ_CLOSE_MSGBOX_EXTEND_BODYITEM_SIZE ), clif_parse_inventory_expansion_reject, 0 );