diff options
Diffstat (limited to 'src/map/itemdb.c')
-rw-r--r-- | src/map/itemdb.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 96eced725..7fedb19ae 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -1336,11 +1336,11 @@ void itemdb_read_options(void) if (!libconfig->load_file(&item_options_db, filepath)) return; - + #ifdef ENABLE_CASE_CHECK script->parser_current_file = filepath; #endif // ENABLE_CASE_CHECK - + if ((ito=libconfig->setting_get_member(item_options_db.root, "item_options_db")) == NULL) { ShowError("itemdb_read_options: '%s' could not be loaded.\n", filepath); libconfig->destroy(&item_options_db); @@ -1399,7 +1399,7 @@ void itemdb_read_options(void) ShowError("itemdb_read_options: Script code not found for entry %s (Id: %d) in '%s', skipping...\n", str, t_opt.index, filepath); continue; } - + /* Set Script */ t_opt.script = *str ? script->parse(str, filepath, t_opt.index, SCRIPT_IGNORE_EXTERNAL_BRACKETS, NULL) : NULL; @@ -1416,11 +1416,11 @@ void itemdb_read_options(void) count++; } - + #ifdef ENABLE_CASE_CHECK script->parser_current_file = NULL; #endif // ENABLE_CASE_CHECK - + libconfig->destroy(&item_options_db); VECTOR_CLEAR(duplicate_id); @@ -1807,10 +1807,10 @@ int itemdb_validate_entry(struct item_data *entry, int n, const char *source) { if( entry->type != IT_ARMOR && entry->type != IT_WEAPON && !entry->flag.no_refine ) entry->flag.no_refine = 1; - + if (entry->type != IT_ARMOR && entry->type != IT_WEAPON && !entry->flag.no_options) entry->flag.no_options = 1; - + if (entry->flag.available != 1) { entry->flag.available = 1; entry->view_id = 0; @@ -2066,7 +2066,7 @@ int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char * if( (t = libconfig->setting_get_member(it, "Refine")) ) id.flag.no_refine = libconfig->setting_get_bool(t) ? 0 : 1; - + if ((t = libconfig->setting_get_member(it, "DisableOptions"))) id.flag.no_options = libconfig->setting_get_bool(t) ? 1 : 0; @@ -2451,10 +2451,10 @@ int itemdb_final_sub(union DBKey key, struct DBData *data, va_list ap) int itemdb_options_final_sub(union DBKey key, struct DBData *data, va_list ap) { struct item_option *ito = DB->data2ptr(data); - + if (ito->script != NULL) script->free_code(ito->script); - + return 0; } |