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

Resolves some compile issues

Browse Source
This commit is contained in:
aleos 2020-12-02 13:59:46 -05:00
parent b4ef4db25f
commit 72b57720f6
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/item_upgrade.cpp
View File

@ -279,7 +279,7 @@ bool s_item_upgrade_db::checkRequirement(item *it, item_data *id)
return false; return false;
if (this->not_socket_enchant) { 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]) if (it->card[i])
return false; return false;
} }

36
src/map/packets.hpp
View File

@ -178,42 +178,6 @@ struct PACKET_ZC_CHANGE_GUILD {
#endif #endif
} __attribute__((packed)); } __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 // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
#if !defined( sun ) && ( !defined( __NETBSD__ ) || __NetBSD_Version__ >= 600000000 ) #if !defined( sun ) && ( !defined( __NETBSD__ ) || __NetBSD_Version__ >= 600000000 )
#pragma pack( pop ) #pragma pack( pop )