From 773f3767d398599af20b6444d8c7da76b9289b7c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 29 Jun 2014 16:41:03 -0700 Subject: [PATCH] eliminate cb_items --- src/kernel/item.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/kernel/item.c b/src/kernel/item.c index 89959c6f7..08c3cb648 100644 --- a/src/kernel/item.c +++ b/src/kernel/item.c @@ -60,7 +60,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. static critbit_tree inames[MAXLOCALES]; static critbit_tree rnames[MAXLOCALES]; static critbit_tree cb_resources; -static critbit_tree cb_items; luxury_type *luxurytypes; potion_type *potiontypes; @@ -194,9 +193,7 @@ void it_register(item_type * itype) assert(lenrtype); - } + rt_register(itype->rtype); } static const char *it_aliases[][2] = { @@ -1249,8 +1246,6 @@ void test_clear_resources(void) memset((void *)oldpotiontype, 0, sizeof(oldpotiontype)); - cb_foreach(&cb_items, "", 0, free_itype_cb, 0); - cb_clear(&cb_items); cb_foreach(&cb_resources, "", 0, free_rtype_cb, 0); cb_clear(&cb_resources); ++num_resources;