From 83cda2ef62410716891cb272ee98d6d168a7b8e1 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 8 Mar 2004 18:39:34 +0000 Subject: [PATCH] =?UTF-8?q?BURG=20->=20GEB=C3=84UDE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/gamecode/laws.c | 1 + src/common/kernel/eressea.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index 72d3c5123..fc59b2a62 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -2980,6 +2980,7 @@ renumber(void) break; case P_BUILDING: + case P_GEBAEUDE: if(!u->building) { cmistake(u,S->s,145,MSG_EVENT); continue; diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index c2db2bbc9..1947f5f3e 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -1338,16 +1338,17 @@ getkeyword (const struct locale * lang) param_t findparam(const char *s, const struct locale * lang) { - struct lstr * lnames = get_lnames(lang); - const building_type * btype; - - int i; - if (findtoken(&lnames->tokens[UT_PARAM], s, (void**)&i)==E_TOK_NOMATCH) { - btype = findbuildingtype(s, lang); - if (btype!=NULL) return (param_t) P_BUILDING; - return NOPARAM; - } - return (param_t)i; + struct lstr * lnames = get_lnames(lang); + const building_type * btype; + + int i; + if (findtoken(&lnames->tokens[UT_PARAM], s, (void**)&i)==E_TOK_NOMATCH) { + btype = findbuildingtype(s, lang); + if (btype!=NULL) return (param_t) P_GEBAEUDE; + return NOPARAM; + } + if (i==P_BUILDING) return P_GEBAEUDE; + return (param_t)i; } param_t