From a44951cf6fdae29e84325fdb92c60caf653c196a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 30 Jan 2005 14:30:31 +0000 Subject: [PATCH] Cleanup: Removing old items created in code and replacing them with XML definitions. --- src/common/items/Jamfile | 5 -- src/common/items/birthday_firework.c | 122 ------------------------- src/common/items/birthday_firework.h | 33 ------- src/common/items/catapultammo.c | 57 ------------ src/common/items/catapultammo.h | 18 ---- src/common/items/items.vcproj | 18 ---- src/common/items/itemtypes.c | 7 -- src/common/items/questkeys.c | 130 --------------------------- src/common/items/questkeys.h | 28 ------ src/common/items/weapons.c | 24 ++--- src/common/kernel/build.c | 13 +-- src/common/settings-eressea.h | 1 - src/common/settings-tutorial.h | 1 - src/common/settings-vinyambar-3.h | 1 - src/common/settings-wdw.h | 1 - src/eressea/korrektur.c | 2 - src/mapper/map_modify.c | 1 - src/mapper/map_partei.c | 1 - src/mapper/map_units.c | 1 - src/mapper/mapper.c | 2 - src/res/de/strings.xml | 8 ++ src/res/eressea/items.xml | 13 +++ src/res/resources.xml | 8 ++ 23 files changed, 50 insertions(+), 445 deletions(-) delete mode 100644 src/common/items/birthday_firework.c delete mode 100644 src/common/items/birthday_firework.h delete mode 100644 src/common/items/catapultammo.c delete mode 100644 src/common/items/catapultammo.h delete mode 100644 src/common/items/questkeys.c delete mode 100644 src/common/items/questkeys.h diff --git a/src/common/items/Jamfile b/src/common/items/Jamfile index 29a6b2de4..06131a789 100644 --- a/src/common/items/Jamfile +++ b/src/common/items/Jamfile @@ -9,15 +9,10 @@ SubDirHdrs $(SUBDIR)/../.. ; SOURCES = artrewards.c - birthday_firework.c - catapultammo.c demonseye.c itemtypes.c - questkeys.c racespoils.c seed.c - speedsail.c - studypotion.c weapons.c xerewards.c ; diff --git a/src/common/items/birthday_firework.c b/src/common/items/birthday_firework.c deleted file mode 100644 index f5ea23cef..000000000 --- a/src/common/items/birthday_firework.c +++ /dev/null @@ -1,122 +0,0 @@ -/* vi: set ts=2: - * - * - * Eressea PB(E)M host Copyright (C) 1998-2003 - * Christian Schlittchen (corwin@amber.kn-bremen.de) - * Katja Zedel (katze@felidae.kn-bremen.de) - * Henning Peters (faroul@beyond.kn-bremen.de) - * Enno Rehling (enno@eressea-pbem.de) - * Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de) - * - * This program may not be used, modified or distributed without - * prior permission by the authors of Eressea. - */ - -#include -#include -#include "birthday_firework.h" - -/* kernel includes */ -#include -#include -#include -#include -#include -#include - -/* util includes */ -#include -#include "../util/message.h" - -/* libc includes */ -#include -#include - -const int FIREWORK_RANGE=10; - - -static int -use_birthday_firework(struct unit * u, const struct item_type * itype, int amount, struct order * ord) -{ - region_list *rlist = all_in_range(u->region, FIREWORK_RANGE, NULL); - region_list *rl; - message *m; - const char *name; - - unused(amount); - - name = getstrtoken(); - - /* "Zur Feier der Geburtstags von %name wird in %region ein großes - * Feuerwerk abgebrannt, welches noch hier zu bewundern ist. Kaskaden - * bunter Sterne, leuchtende Wasserfälle aus Licht und strahlende - * Feuerdrachen erhellen den Himmel." */ - - if(name && *name) { - m = new_message(u->faction, "birthday_firework%u:unit%r:region%s:name", - u, u->region, strdup(name)); - add_message(&u->region->msgs, new_message(u->faction, "birthday_firework_local%u:unit%s:name",u, strdup(name))); - } else { - m = new_message(u->faction, "birthday_firework_noname%u:unit%r:region", - u, u->region); - add_message(&u->region->msgs, new_message(u->faction, "birthday_firework_noname_local%u:unit%s:name",u)); - } - - for(rl = rlist; rl; rl=rl->next) if(rl->data != u->region) { - add_message(&rl->data->msgs, m); - } - - msg_release(m); - free_regionlist(rlist); - - res_changeitem(u, itype->rtype, -1); - - return 0; -} - -resource_type rt_birthday_firework = { - { "birthday_firework", "birthday_firework_p" }, - { "birthday_firework", "birthday_firework_p" }, - RTF_ITEM, - &res_changeitem -}; - -item_type it_birthday_firework = { - &rt_birthday_firework, /* resourcetype */ - 0, 50, 0, /* flags, weight, capacity */ - NULL, /* construction */ - &use_birthday_firework, /* use */ - NULL, - NULL /* give */ -}; - -void -register_birthday_firework(void) -{ - it_register(&it_birthday_firework); - it_birthday_firework.rtype->flags |= RTF_POOLED; - register_function((pf_generic)use_birthday_firework, "usefirework"); -} - -resource_type rt_lebkuchenherz = { - { "lebkuchenherz", "lebkuchenherz_p" }, - { "lebkuchenherz", "lebkuchenherz_p" }, - RTF_ITEM, - &res_changeitem -}; - -item_type it_lebkuchenherz = { - &rt_lebkuchenherz, /* resourcetype */ - 0, 0, 0, /* flags, weight, capacity */ - NULL, /* construction */ - NULL, /* use */ - NULL /* give */ -}; - -void -register_lebkuchenherz(void) -{ - it_register(&it_lebkuchenherz); - it_lebkuchenherz.rtype->flags |= RTF_POOLED; -} - diff --git a/src/common/items/birthday_firework.h b/src/common/items/birthday_firework.h deleted file mode 100644 index 832205ac4..000000000 --- a/src/common/items/birthday_firework.h +++ /dev/null @@ -1,33 +0,0 @@ -/* vi: set ts=2: - * - * - * Eressea PB(E)M host Copyright (C) 1998-2003 - * Christian Schlittchen (corwin@amber.kn-bremen.de) - * Katja Zedel (katze@felidae.kn-bremen.de) - * Henning Peters (faroul@beyond.kn-bremen.de) - * Enno Rehling (enno@eressea-pbem.de) - * Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de) - * - * This program may not be used, modified or distributed without - * prior permission by the authors of Eressea. - */ - -#ifndef H_ITM_BIRTHDAY -#define H_ITM_BIRTHDAY -#ifdef __cplusplus -extern "C" { -#endif -extern struct item_type it_birthday_firework; -extern struct resource_type rt_birthday_firework; - -extern void register_birthday_firework(void); - -extern struct item_type it_lebkuchenherz; -extern struct resource_type rt_lebkuchenherz; -extern void register_lebkuchenherz(void); - -#ifdef __cplusplus -} -#endif -#endif - diff --git a/src/common/items/catapultammo.c b/src/common/items/catapultammo.c deleted file mode 100644 index e054983ec..000000000 --- a/src/common/items/catapultammo.c +++ /dev/null @@ -1,57 +0,0 @@ -/* vi: set ts=2: - +-------------------+ Christian Schlittchen - | | Enno Rehling - | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2003 | Henning Peters - | | Ingo Wilken - +-------------------+ Stefan Reich - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. -*/ - -#include -#include - -#include "catapultammo.h" - -#include -#include - -/* kernel includes */ -#include - -/* libc includes */ -#include - -static requirement mat_catapultammo[] = { - {I_STONE, 1}, - {0, 0} -}; - -resource_type rt_catapultammo = { - { "catapultammo", "catapultammo_p" }, - { "catapultammo", "catapultammo_p" }, - RTF_ITEM|RTF_POOLED, - &res_changeitem -}; - -static construction con_catapultammo = { - SK_QUARRYING, 3, /* skill, minskill */ - -1, 1, mat_catapultammo /* maxsize, reqsize [,materials] */ -}; - -item_type it_catapultammo = { - &rt_catapultammo, /* resourcetype */ - 0, 1000, 0, /* flags, weight, capacity */ - &con_catapultammo, /* construction */ - NULL, /* use */ - NULL /* give */ -}; - -void -register_catapultammo(void) -{ - it_register(&it_catapultammo); -} - diff --git a/src/common/items/catapultammo.h b/src/common/items/catapultammo.h deleted file mode 100644 index 615e7f354..000000000 --- a/src/common/items/catapultammo.h +++ /dev/null @@ -1,18 +0,0 @@ -/* vi: set ts=2: - * - * - * Eressea PB(E)M host Copyright (C) 1998-2003 - * Christian Schlittchen (corwin@amber.kn-bremen.de) - * Katja Zedel (katze@felidae.kn-bremen.de) - * Henning Peters (faroul@beyond.kn-bremen.de) - * Enno Rehling (enno@eressea-pbem.de) - * Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de) - * - * This program may not be used, modified or distributed without - * prior permission by the authors of Eressea. - */ - -extern struct item_type it_catapultammo; -extern struct resource_type rt_catapultammo; -extern void register_catapultammo(void); - diff --git a/src/common/items/items.vcproj b/src/common/items/items.vcproj index 30ef11f8a..0df0b6c4e 100644 --- a/src/common/items/items.vcproj +++ b/src/common/items/items.vcproj @@ -123,21 +123,12 @@ - - - - - - @@ -154,21 +145,12 @@ - - - - - - diff --git a/src/common/items/itemtypes.c b/src/common/items/itemtypes.c index 527db9aca..7cf86d7f7 100644 --- a/src/common/items/itemtypes.c +++ b/src/common/items/itemtypes.c @@ -14,7 +14,6 @@ #include #include "itemtypes.h" -#include "birthday_firework.h" #include "demonseye.h" #include "xerewards.h" #include "artrewards.h" @@ -23,8 +22,6 @@ #if GROWING_TREES # include "seed.h" #endif -#include "questkeys.h" -#include "catapultammo.h" void register_itemtypes(void) @@ -36,10 +33,6 @@ register_itemtypes(void) register_seed(); register_mallornseed(); #endif - register_birthday_firework(); - register_lebkuchenherz(); - register_questkeys(); - register_catapultammo(); register_racespoils(); register_artrewards(); } diff --git a/src/common/items/questkeys.c b/src/common/items/questkeys.c deleted file mode 100644 index 385a0be09..000000000 --- a/src/common/items/questkeys.c +++ /dev/null @@ -1,130 +0,0 @@ -/* vi: set ts=2: - * - * - * Eressea PB(E)M host Copyright (C) 1998-2003 - * Christian Schlittchen (corwin@amber.kn-bremen.de) - * Katja Zedel (katze@felidae.kn-bremen.de) - * Henning Peters (faroul@beyond.kn-bremen.de) - * Enno Rehling (enno@eressea-pbem.de) - * Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de) - * - * This program may not be used, modified or distributed without - * prior permission by the authors of Eressea. - */ - -#include -#include -#include "questkeys.h" - -/* kernel includes */ -#include -#include -#include -#include -#include -#include -#include - -/* util includes */ -#include - -/* libc includes */ -#include -#include - -extern border *borders[]; - -static int -use_questkey(struct unit * u, const struct item_type * itype, int amount, struct order * ord) -{ - border *bo; - region *r1, *r2; - int lock, k; - message *m; - unit *u2; - - if(u->region->x != 43 || u->region->y != -39) { - ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "use_questkey_wrongregion", "")); - return EUNUSABLE; - } - - r1 = findregion(43,-39); - r2 = findregion(44,-39); - bo = get_borders(r1, r2); - - while (bo!=NULL) { - if(bo->type == &bt_questportal) { - break; - } - bo = bo->next; - } - - assert(bo != NULL); - - lock = (int)bo->data; - if (itype == &it_questkey1) k = 1; - else k = 2; - - if (lock & k) { - m = msg_message("questportal_unlock","region unit key", u->region, u, k); - lock = lock & ~k; - } else { - m = msg_message("questportal_lock","region unit key", u->region, u, k); - lock = lock | k; - } - - bo->data = (void *)lock; - - for(u2 = u->region->units; u2; u2=u2->next) { - freset(u2->faction, FL_DH); - } - for(u2 = u->region->units; u2; u2=u2->next) { - if(!fval(u2->faction, FL_DH)) { - add_message(&u2->faction->msgs, m); - fset(u2->faction, FL_DH); - } - } - - return 0; -} - -static resource_type rt_questkey1 = { - { "questkey1", "questkey1_p" }, - { "questkey1", "questkey1_p" }, - RTF_ITEM, - &res_changeitem -}; - -static resource_type rt_questkey2 = { - { "questkey2", "questkey2_p" }, - { "questkey2", "questkey2_p" }, - RTF_ITEM, - &res_changeitem -}; - -item_type it_questkey1 = { - &rt_questkey1, /* resourcetype */ - ITF_NOTLOST, 1, 0, /* flags, weight, capacity */ - NULL, /* construction */ - &use_questkey, - NULL, - NULL -}; - -item_type it_questkey2 = { - &rt_questkey2, /* resourcetype */ - ITF_NOTLOST, 1, 0, /* flags, weight, capacity */ - NULL, /* construction */ - &use_questkey, - NULL, - NULL -}; - -void -register_questkeys(void) -{ - it_register(&it_questkey1); - it_register(&it_questkey2); - register_function((pf_generic)use_questkey, "usequestkey"); -} - diff --git a/src/common/items/questkeys.h b/src/common/items/questkeys.h deleted file mode 100644 index bbe80619d..000000000 --- a/src/common/items/questkeys.h +++ /dev/null @@ -1,28 +0,0 @@ -/* vi: set ts=2: - * - * - * Eressea PB(E)M host Copyright (C) 1998-2003 - * Christian Schlittchen (corwin@amber.kn-bremen.de) - * Katja Zedel (katze@felidae.kn-bremen.de) - * Henning Peters (faroul@beyond.kn-bremen.de) - * Enno Rehling (enno@eressea-pbem.de) - * Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de) - * - * This program may not be used, modified or distributed without - * prior permission by the authors of Eressea. - */ - -#ifndef H_ITM_QUESTKEYS -#define H_ITM_QUESTKEYS -#ifdef __cplusplus -extern "C" { -#endif - -extern struct item_type it_questkey1; -extern struct item_type it_questkey2; -extern void register_questkeys(void); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c index f79b94397..3b1096e84 100644 --- a/src/common/items/weapons.c +++ b/src/common/items/weapons.c @@ -16,8 +16,6 @@ #include #include "weapons.h" -#include "catapultammo.h" - #include #include #include @@ -205,6 +203,10 @@ attack_catapult(const troop * at, int * casualties, int row) int d = 0, n; int minrow, maxrow; weapon * wp = af->person[at->index].missile; + static item_type * it_catapultammo = NULL; + if (it_catapultammo==NULL) { + it_catapultammo = it_find("catapultammo"); + } assert(row>=FIGHT_ROW); if (row>BEHIND_ROW) { @@ -214,12 +216,12 @@ attack_catapult(const troop * at, int * casualties, int row) assert(wp->type->itype==olditemtype[I_CATAPULT]); assert(af->person[at->index].reload==0); -#if CATAPULT_AMMUNITION - if(new_get_pooled(au, &rt_catapultammo, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK) <= 0) { - /* No ammo. Use other weapon if available. */ - return true; - } -#endif + if (it_catapultammo!=NULL) { + if (new_get_pooled(au, it_catapultammo->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK) <= 0) { + /* No ammo. Use other weapon if available. */ + return true; + } + } if (af->catmsg == -1) { int i, k=0; @@ -235,9 +237,9 @@ attack_catapult(const troop * at, int * casualties, int row) n = min(CATAPULT_ATTACKS, count_enemies(b, af->side, minrow, maxrow, true)); -#if CATAPULT_AMMUNITION - new_use_pooled(au, &rt_catapultammo, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, 1); -#endif + if (it_catapultammo!=NULL) { + new_use_pooled(au, it_catapultammo->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, 1); + } while (--n >= 0) { /* Select defender */ diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index b00c9d837..516f3cce3 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -60,8 +60,6 @@ /* attributes inclues */ #include -#include - #define STONERECYCLE 50 /* Name, MaxGroesse, MinBauTalent, Kapazitaet, {Eisen, Holz, Stein, BauSilber, * Laen, Mallorn}, UnterSilber, UnterSpezialTyp, UnterSpezial */ @@ -198,7 +196,12 @@ siege_cmd(unit * u, order * ord) int bewaffnete, katapultiere = 0; static boolean init = false; static const curse_type * magicwalls_ct; - if (!init) { init = true; magicwalls_ct = ct_find("magicwalls"); } + static item_type * it_catapultammo = NULL; + if (!init) { + init = true; + magicwalls_ct = ct_find("magicwalls"); + it_catapultammo = it_find("catapultammo"); + } /* gibt es ueberhaupt Burgen? */ init_tokens(ord); @@ -218,7 +221,7 @@ siege_cmd(unit * u, order * ord) /* schaden durch katapulte */ d = min(u->number, - min(new_get_pooled(u, &rt_catapultammo, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK), get_item(u, I_CATAPULT))); + min(new_get_pooled(u, it_catapultammo->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK), get_item(u, I_CATAPULT))); if (eff_skill(u, SK_CATAPULT, r) >= 1) { katapultiere = d; d *= eff_skill(u, SK_CATAPULT, r); @@ -252,7 +255,7 @@ siege_cmd(unit * u, order * ord) /* meldung, schaden anrichten */ if (d && !curse_active(get_curse(b->attribs, magicwalls_ct))) { b->size -= d; - new_use_pooled(u, &rt_catapultammo, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, d); + new_use_pooled(u, it_catapultammo->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, d); d = 100 * d / b->size; } else d = 0; diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index 8b59097e4..d004bb3a6 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -28,7 +28,6 @@ #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define CATAPULT_AMMUNITION 1 /* Gebaut werden kann sie auch mit 0! */ #define CHANGED_CROSSBOWS 1 #define COMBAT_TURNS 5 #define PEASANTS_DO_NOT_STARVE 0 diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h index 06f17c30c..1bbdab065 100644 --- a/src/common/settings-tutorial.h +++ b/src/common/settings-tutorial.h @@ -28,7 +28,6 @@ #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define CATAPULT_AMMUNITION 1 /* Gebaut werden kann sie auch mit 0! */ #define CHANGED_CROSSBOWS 1 #define NEWATSROI 0 #define COMBAT_TURNS 5 diff --git a/src/common/settings-vinyambar-3.h b/src/common/settings-vinyambar-3.h index e142ace16..a61390cc8 100644 --- a/src/common/settings-vinyambar-3.h +++ b/src/common/settings-vinyambar-3.h @@ -28,7 +28,6 @@ #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define CATAPULT_AMMUNITION 1 /* Gebaut werden kann sie auch mit 0! */ #define CHANGED_CROSSBOWS 1 #define NEWATSROI 0 #define COMBAT_TURNS 5 diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h index 61aa8af5d..90d3d7c9f 100644 --- a/src/common/settings-wdw.h +++ b/src/common/settings-wdw.h @@ -28,7 +28,6 @@ #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define CATAPULT_AMMUNITION 1 /* Gebaut werden kann sie auch mit 0! */ #define CHANGED_CROSSBOWS 1 #define COMBAT_TURNS 5 #define PEASANTS_DO_NOT_STARVE 0 diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 209a0e485..83f358157 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -23,8 +23,6 @@ /* misc includes */ #include -#include -#include #include /* gamecode includes */ diff --git a/src/mapper/map_modify.c b/src/mapper/map_modify.c index 09cc0a717..5c50a4e60 100644 --- a/src/mapper/map_modify.c +++ b/src/mapper/map_modify.c @@ -11,7 +11,6 @@ * prior permission by the authors of Eressea. */ -#define BOOL_DEFINED /* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */ /* wenn curses.h nicht vor mapper included wird, kennt es die structs nicht. TODO: curses-teil separieren (map_tools.h) */ #include diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c index 10702972d..5cdeaa69c 100644 --- a/src/mapper/map_partei.c +++ b/src/mapper/map_partei.c @@ -11,7 +11,6 @@ * prior permission by the authors of Eressea. */ -#define BOOL_DEFINED #include #include #include diff --git a/src/mapper/map_units.c b/src/mapper/map_units.c index a1b72ee1b..3552dcb28 100644 --- a/src/mapper/map_units.c +++ b/src/mapper/map_units.c @@ -12,7 +12,6 @@ * prior permission by the authors of Eressea. */ -#define BOOL_DEFINED /* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */ #include diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c index 3e075b632..92db88d07 100644 --- a/src/mapper/mapper.c +++ b/src/mapper/mapper.c @@ -14,8 +14,6 @@ #define VERSION "3.3.0" #define ISLANDSIZE 20 -#define MAIN_C -#define BOOL_DEFINED /* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */ #include #include diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml index 2e3515428..fc03e2f80 100644 --- a/src/res/de/strings.xml +++ b/src/res/de/strings.xml @@ -1299,6 +1299,14 @@ Lebkuchenherzen mit der Aufschrift 'Erz und Stein, das ist fein' + + Schlüssel + key + + + Schlüssel + keys + Achatener Schlüssel agate key diff --git a/src/res/eressea/items.xml b/src/res/eressea/items.xml index 99c6b06a0..3135a8ffe 100644 --- a/src/res/eressea/items.xml +++ b/src/res/eressea/items.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/src/res/resources.xml b/src/res/resources.xml index bd5e6d771..9b6d01e84 100644 --- a/src/res/resources.xml +++ b/src/res/resources.xml @@ -91,4 +91,12 @@ + + + + + + + +