From 8eadb9fc241e1784084625e89b208d80bda9e6e2 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 13 Jan 2014 04:06:56 +0100 Subject: Improved overwriting priority of variables/constants/parameters - Fixes issue 7968, thanks to Moguri http://hercules.ws/board/tracker/issue-7968-trader-npc-not-working/ - Corrected sprite name for KO_KAGE to match latest kRO info (previouly KO_ZANZOU, conflicting with a Kagerou/Oboro skill identifier) - Updated self-test script to include checks for constants and for setd and getd. - Made possible thanks to Ind. Signed-off-by: Haru --- src/map/itemdb.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/map/itemdb.c') diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 3f7d06e36..3bed3e03d 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -2249,16 +2249,6 @@ void itemdb_name_constants(void) { dbi_destroy(iter); } -/* used to clear conflicts during script reload */ -void itemdb_force_name_constants(void) { - DBIterator *iter = db_iterator(itemdb->names); - struct item_data *data; - - for( data = dbi_first(iter); dbi_exists(iter); data = dbi_next(iter) ) - script->set_constant_force(data->name,data->nameid,0); - - dbi_destroy(iter); -} void do_final_itemdb(void) { itemdb->clear(true); @@ -2286,7 +2276,6 @@ void itemdb_defaults(void) { itemdb->final = do_final_itemdb; itemdb->reload = itemdb_reload; itemdb->name_constants = itemdb_name_constants; - itemdb->force_name_constants = itemdb_force_name_constants; /* */ itemdb->groups = NULL; itemdb->group_count = 0; -- cgit v1.2.3-60-g2f50