From 95929a99b5a5b0b1052b9b081a1c5933a82a2b46 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 29 Jun 2014 16:46:42 -0700 Subject: [PATCH] we are about to remove rt_register, but not quite yet. --- src/kernel/item.c | 1 - src/kernel/item.h | 2 +- src/tests.c | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kernel/item.c b/src/kernel/item.c index 08c3cb648..ec307bbf2 100644 --- a/src/kernel/item.c +++ b/src/kernel/item.c @@ -193,7 +193,6 @@ void it_register(item_type * itype) assert(lenrtype); } static const char *it_aliases[][2] = { diff --git a/src/kernel/item.h b/src/kernel/item.h index fd4073300..a80da6c2e 100644 --- a/src/kernel/item.h +++ b/src/kernel/item.h @@ -225,7 +225,7 @@ extern "C" { int *deaths); } weapon_type; - extern void rt_register(resource_type * it); + void rt_register(resource_type * it); resource_type *rt_find(const char *name); item_type *it_find(const char *name); diff --git a/src/tests.c b/src/tests.c index 6ebafea1d..0ed746388 100644 --- a/src/tests.c +++ b/src/tests.c @@ -124,7 +124,8 @@ item_type * test_create_itemtype(const char ** names) { item_type * itype; rtype = new_resourcetype(names, NULL, RTF_ITEM); - itype = new_itemtype(rtype, ITF_ANIMAL|ITF_BIG, 5000, 7000); + rt_register(rtype); + itype = new_itemtype(rtype, ITF_ANIMAL | ITF_BIG, 5000, 7000); return itype; } @@ -148,7 +149,7 @@ void test_create_world(void) test_create_itemtype(names+0); test_create_itemtype(names+4); - test_create_itemtype(names+6); + test_create_itemtype(names + 6); t_plain = test_create_terrain("plain", LAND_REGION | FOREST_REGION | WALK_INTO | CAVALRY_REGION); t_plain->size = 1000;