From 72b57720f67a3e6d6f1ecb1f128f6950ebb020e2 Mon Sep 17 00:00:00 2001 From: aleos Date: Wed, 2 Dec 2020 13:59:46 -0500 Subject: [PATCH] Resolves some compile issues --- src/map/item_upgrade.cpp | 2 +- src/map/packets.hpp | 36 ------------------------------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/src/map/item_upgrade.cpp b/src/map/item_upgrade.cpp index 25454b3f3e..3c9c2e4a91 100644 --- a/src/map/item_upgrade.cpp +++ b/src/map/item_upgrade.cpp @@ -279,7 +279,7 @@ bool s_item_upgrade_db::checkRequirement(item *it, item_data *id) return false; if (this->not_socket_enchant) { - for (int i = id->slot; i < MAX_SLOTS; i++) { + for (int i = id->slots; i < MAX_SLOTS; i++) { if (it->card[i]) return false; } diff --git a/src/map/packets.hpp b/src/map/packets.hpp index 1777c72bc4..bca74f0e3b 100644 --- a/src/map/packets.hpp +++ b/src/map/packets.hpp @@ -178,42 +178,6 @@ struct PACKET_ZC_CHANGE_GUILD { #endif } __attribute__((packed)); -#if PACKETVER_MAIN_NUM >= 20170726 || PACKETVER_RE_NUM >= 20170621 || defined(PACKETVER_ZERO) -struct PACKET_ZC_LAPINEUPGRADE_OPEN { - int16 packetType; -#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114 - uint32 itemId; -#else - uint16 itemId; -#endif -} __attribute__((packed)); -DEFINE_PACKET_HEADER(ZC_LAPINEUPGRADE_OPEN, 0x0ab4); - -struct PACKET_ZC_LAPINEUPGRADE_RESULT { - int16 packetType; - uint16 result; -} __attribute__((packed)); -DEFINE_PACKET_HEADER(ZC_LAPINEUPGRADE_RESULT, 0x0ab7); -#endif // PACKETVER_MAIN_NUM >= 20170726 || PACKETVER_RE_NUM >= 20170621 || defined(PACKETVER_ZERO) - -#if PACKETVER_MAIN_NUM >= 20170111 || PACKETVER_RE_NUM >= 20170111 || defined(PACKETVER_ZERO) -struct PACKET_CZ_LAPINEUPGRADE_CLOSE { - int16 packetType; -} __attribute__((packed)); -DEFINE_PACKET_HEADER(CZ_LAPINEUPGRADE_CLOSE, 0x0ab5); - -struct PACKET_CZ_LAPINEUPGRADE_MAKE_ITEM { - int16 packetType; -#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114 - uint32 itemId; -#else - uint16 itemId; -#endif - uint16 index; -} __attribute__((packed)); -DEFINE_PACKET_HEADER(CZ_LAPINEUPGRADE_MAKE_ITEM, 0x0ab6); -#endif // PACKETVER_MAIN_NUM >= 20170111 || PACKETVER_RE_NUM >= 20170111 || defined(PACKETVER_ZERO) - // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #if !defined( sun ) && ( !defined( __NETBSD__ ) || __NetBSD_Version__ >= 600000000 ) #pragma pack( pop )