From 926cff033bb9533ae3d8615f8b90e2e443d0525b Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 21 Aug 2017 20:58:36 +0200 Subject: Add support for bitmask arrays in the item_db Upper field Signed-off-by: Haru --- src/map/itemdb.c | 2 +- src/map/script.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 7a2c967fb..0ace20984 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -2037,7 +2037,7 @@ int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char * itemdb->jobmask2mapid(id.class_base, UINT64_MAX); } - if( itemdb->lookup_const(it, "Upper", &i32) && i32 >= 0 ) + if (itemdb->lookup_const_mask(it, "Upper", &i32) && i32 >= 0) id.class_upper = (unsigned int)i32; else if( !inherit ) id.class_upper = ITEMUPPER_ALL; diff --git a/src/map/script.c b/src/map/script.c index 5ce581db6..f29ce4104 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -24572,6 +24572,16 @@ void script_hardcoded_constants(void) script->set_constant("A_CANNONBALL", A_CANNONBALL, false, false); script->set_constant("A_THROWWEAPON", A_THROWWEAPON, false, false); + script->constdb_comment("Item Upper Masks"); + script->set_constant("ITEMUPPER_NONE", ITEMUPPER_NONE, false, false); + script->set_constant("ITEMUPPER_NORMAL", ITEMUPPER_NORMAL, false, false); + script->set_constant("ITEMUPPER_UPPER", ITEMUPPER_UPPER, false, false); + script->set_constant("ITEMUPPER_BABY", ITEMUPPER_BABY, false, false); + script->set_constant("ITEMUPPER_THIRD", ITEMUPPER_THIRD, false, false); + script->set_constant("ITEMUPPER_THIRDUPPER", ITEMUPPER_THIRDUPPER, false, false); + script->set_constant("ITEMUPPER_THIRDBABY", ITEMUPPER_THIRDBABY, false, false); + script->set_constant("ITEMUPPER_ALL", ITEMUPPER_ALL, false, false); + script->constdb_comment("Renewal"); #ifdef RENEWAL script->set_constant("RENEWAL", 1, false, false); -- cgit v1.2.3-60-g2f50