From 2d2ed6f7ea0de1c57bb9b1dbba3f2cc730f1cdaa Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 2 Oct 2005 13:21:29 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=712 rusty shields disappear because of stupid reverse_lookup code. removed a bit of dead code. --- src/common/kernel/build.c | 10 ---------- src/common/kernel/item.c | 2 +- src/common/util/language.c | 3 ++- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index 1a323e6e6..545d46bfd 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -382,11 +382,6 @@ destroy_cmd(unit * u, struct order * ord) return 0; } -#if 0 - con = b->type->construction; - size = b->size; -#endif - if(n >= b->size) { /* destroy completly */ /* all units leave the building */ @@ -411,11 +406,6 @@ destroy_cmd(unit * u, struct order * ord) return 0; } -#if 0 - con = sh->type->construction; - size = (sh->size * DAMAGE_SCALE - sh->damage) / DAMAGE_SCALE; -#endif - if (rterrain(r) == T_OCEAN) { cmistake(u, ord, 14, MSG_EVENT); return 0; diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index 1606205bb..429d4b66e 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -1101,7 +1101,7 @@ static t_item itemdata[MAXITEMS] = { IS_PRODUCT, SK_WEAPONSMITH, 3, {1, 0, 0, 0, 0, 0}, 100, 0, 0, NULL }, { /* I_RUSTY_SHIELD 42 */ - {"Rostiges Schild", "Rostige Schilde", "Rostiges Schild", "Rostige Schilde"}, + {"Rostiger Schild", "Rostige Schilde", "Rostiges Schild", "Rostige Schilde"}, IS_PRODUCT, SK_ARMORER, 2, {1, 0, 0, 0, 0, 0}, 100, 0, 0, NULL }, { /* I_RUSTY_CHAIN_MAIL */ diff --git a/src/common/util/language.c b/src/common/util/language.c index 930bf6d63..1fbb9b970 100644 --- a/src/common/util/language.c +++ b/src/common/util/language.c @@ -176,7 +176,8 @@ reverse_lookup(const locale * lang, const char * str) } } } - log_warning(("could not do a reverse_lookup for \"%s\" in locale %s\n", str, lang->name)); + log_error(("could not do a reverse_lookup for \"%s\" in locale %s\n", str, lang->name)); + assert(!"failed to do a reverse_lookup"); } return str; }