From 62bafa089bab20c641a48855a1ed6d9aa6c3aad4 Mon Sep 17 00:00:00 2001 From: hemagx Date: Mon, 14 Dec 2015 22:08:04 +0200 Subject: Costume and Shadow items are not equip-able anymore on older clients that doesn't support it. Fixes #947 Closes #954 as merged Signed-off-by: Haru --- src/map/itemdb.h | 2 ++ src/map/pc.c | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'src/map') diff --git a/src/map/itemdb.h b/src/map/itemdb.h index c804e4b4f..f508f5c1d 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -535,6 +535,8 @@ struct item_data { #define itemdb_iscashfood(n) ((n) >= ITEMID_STR_DISH10_ && (n) <= ITEMID_VIT_DISH10_) #define itemdb_is_GNbomb(n) ((n) >= ITEMID_APPLE_BOMB && (n) <= ITEMID_VERY_HARD_LUMP) #define itemdb_is_GNthrowable(n) ((n) >= ITEMID_MYSTERIOUS_POWDER && (n) <= ITEMID_BLACK_THING_TO_THROW) +#define itemdb_is_shadowequip(n) ((n) & (EQP_SHADOW_ARMOR|EQP_SHADOW_WEAPON|EQP_SHADOW_SHIELD|EQP_SHADOW_SHOES|EQP_SHADOW_ACC_R|EQP_SHADOW_ACC_L)) +#define itemdb_is_costumeequip(n) ((n) & (EQP_COSTUME_HEAD_TOP|EQP_COSTUME_HEAD_MID|EQP_COSTUME_HEAD_LOW|EQP_COSTUME_GARMENT)) //Item trade restrictions [Skotlex] #define itemdb_isdropable(item, gmlv) (itemdb->isrestricted((item), (gmlv), 0, itemdb->isdropable_sub)) diff --git a/src/map/pc.c b/src/map/pc.c index 567348d20..43d320a80 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -928,6 +928,11 @@ int pc_isequip(struct map_session_data *sd,int n) if(item == NULL) return 0; +#if PACKETVER <= 20100707 + if (itemdb_is_shadowequip(item->equip) || itemdb_is_costumeequip(item->equip)) + return 0; +#endif + if(pc_has_permission(sd, PC_PERM_USE_ALL_EQUIPMENT)) return 1; -- cgit v1.2.3-70-g09d2