From 67da60223982489d48feee78c85c52c620d0c5d8 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 3 Sep 2019 14:15:03 -0300 Subject: Revert "Drop support for Required<> params in ItemDB" This reverts commit 4a6c4e17275bc82c20bb768861ce8918d35b9965. --- src/emap/data/itemd.c | 2 -- src/emap/itemdb.c | 2 -- src/emap/pc.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/emap/data/itemd.c b/src/emap/data/itemd.c index bb655ae..15b143b 100644 --- a/src/emap/data/itemd.c +++ b/src/emap/data/itemd.c @@ -50,7 +50,6 @@ struct ItemdExt *itemd_create(void) data->floorLifeTime = battle->bc->flooritem_lifetime; data->allowPickup = true; data->identified = true; - /* data->requiredStr = 0; data->requiredAgi = 0; data->requiredVit = 0; @@ -65,7 +64,6 @@ struct ItemdExt *itemd_create(void) data->requiredDef = 0; data->requiredMDef = 0; data->requiredSkill = 0; - */ data->useEffect = -1; data->useFailEffect = -1; data->unequipEffect = -1; diff --git a/src/emap/itemdb.c b/src/emap/itemdb.c index 9a47725..d9ff7d8 100644 --- a/src/emap/itemdb.c +++ b/src/emap/itemdb.c @@ -64,7 +64,6 @@ void eitemdb_readdb_additional_fields_pre(int *itemid, data->floorLifeTime = i32; if ((t = libconfig->setting_get_member(it, "AllowPickup"))) data->allowPickup = libconfig->setting_get_bool(t) ? 1 : 0; - /* if (libconfig->setting_lookup_int(it, "RequiredStr", &i32) && i32 >= 0) data->requiredStr = i32; if (libconfig->setting_lookup_int(it, "RequiredAgi", &i32) && i32 >= 0) @@ -93,7 +92,6 @@ void eitemdb_readdb_additional_fields_pre(int *itemid, data->requiredMDef = i32; if (itemdb->lookup_const(it, "RequiredSkill", &i32)) data->requiredSkill = i32; - */ if (libconfig->setting_lookup_bool(it, "Charm", &i32) && i32 >= 0) data->charmItem = i32 ? true : false; if (libconfig->setting_lookup_bool(it, "Identified", &i32) && i32 >= 0) diff --git a/src/emap/pc.c b/src/emap/pc.c index 22fb7c8..ec45cdc 100644 --- a/src/emap/pc.c +++ b/src/emap/pc.c @@ -293,7 +293,6 @@ int epc_isequip_post(int retVal, if (!data) return retVal; - /* if (sd->battle_status.str < data->requiredStr || sd->battle_status.agi < data->requiredAgi || sd->battle_status.vit < data->requiredVit || @@ -312,7 +311,6 @@ int epc_isequip_post(int retVal, { return 0; } - */ } return retVal; } -- cgit v1.2.3-60-g2f50