diff --git a/res/eressea/items.xml b/res/eressea/items.xml index a785691fe..3f5cc3d17 100644 --- a/res/eressea/items.xml +++ b/res/eressea/items.xml @@ -54,30 +54,22 @@ - - - + - - - + - - - + - - - + diff --git a/src/helpers.c b/src/helpers.c index 5124ca0ae..e8e6521c4 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -529,9 +529,6 @@ use_item_lua(unit *u, const item_type *itype, int amount, struct order *ord) } else { log_error("no such callout: %s", fname); } - if (itype->use) { - return itype->use(u, itype, amount, ord); - } log_error("use(%s) calling '%s': not a function.\n", unitname(u), fname); lua_pop(L, 1); diff --git a/src/kernel/item.h b/src/kernel/item.h index b0bc10cd8..14196ab37 100644 --- a/src/kernel/item.h +++ b/src/kernel/item.h @@ -126,8 +126,6 @@ extern "C" { /* --- functions --- */ bool(*canuse) (const struct unit * user, const struct item_type * itype); - int(*use) (struct unit * user, const struct item_type * itype, int amount, - struct order * ord); int(*give) (struct unit * src, struct unit * dest, const struct item_type * itm, int number, struct order * ord); int score; @@ -310,8 +308,6 @@ extern "C" { const struct item_type *, int, struct order *), const char *name); void register_item_use(int(*foo) (struct unit *, const struct item_type *, int, struct order *), const char *name); - void register_item_useonother(int(*foo) (struct unit *, int, - const struct item_type *, int, struct order *), const char *name); void free_resources(void); diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c index 69e9c22d0..af0a9dd23 100644 --- a/src/kernel/xmlreader.c +++ b/src/kernel/xmlreader.c @@ -854,13 +854,6 @@ static item_type *xml_readitem(xmlXPathContextPtr xpath, resource_type * rtype) (int(*)(struct unit *, struct unit *, const struct item_type *, int, struct order *))fun; } - else if (strcmp((const char *)propValue, "use") == 0) { - log_error("%s has a use function", rtype->_name); - itype->flags |= ITF_CANUSE; - itype->use = - (int(*)(struct unit *, const struct item_type *, int, - struct order *))fun; - } else if (strcmp((const char *)propValue, "canuse") == 0) { itype->canuse = (bool(*)(const struct unit *, const struct item_type *))fun; diff --git a/src/modules/museum.c b/src/modules/museum.c index af37019d0..1eee3529f 100644 --- a/src/modules/museum.c +++ b/src/modules/museum.c @@ -497,9 +497,10 @@ void register_museum(void) at_register(&at_museumgivebackcookie); at_register(&at_museumgiveback); - register_item_use(use_museumticket, "use_museumticket"); - register_item_use(use_museumkey, "use_museumkey"); register_item_use(use_museumexitticket, "use_museumexitticket"); + register_item_use(use_museumticket, "use_museumticket"); + register_item_use(use_museumkey, "use_questkey1"); + register_item_use(use_museumkey, "use_questkey2"); } #endif