From e70aaad0f7e2114286cabafcbcc82ff7aa33e6be Mon Sep 17 00:00:00 2001 From: Katja Zedel Date: Sun, 27 May 2001 09:35:19 +0000 Subject: [PATCH] resname local-isiert --- src/common/gamecode/economy.c | 8 ++++++-- src/common/kernel/build.c | 5 ++++- src/common/kernel/magic.c | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index c382105a0..5570acc03 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -1347,7 +1347,9 @@ manufacture(unit * u, const item_type * itype, int want) if (c!=0) strcat(ch++, ","); n=cons->materials[c].number / cons->reqsize; - sprintf(ch, " %d %s", n?n:1, resname(cons->materials[c].type, cons->materials[c].number==1)); + sprintf(ch, " %d %s", n?n:1, + locale_string(u->faction->locale, + resname(cons->materials[c].type, cons->materials[c].number!=1))); ch = ch+strlen(ch); } strcat(ch,"."); @@ -1635,7 +1637,9 @@ create_potion(unit * u, const potion_type * ptype, int want) if (c!=0) strcat(ch++, ","); n=cons->materials[c].number / cons->reqsize; - sprintf(ch, " %d %s", n?n:1, resname(cons->materials[c].type, cons->materials[c].number==1)); + sprintf(ch, " %d %s", n?n:1, + locale_string(u->faction->locale, + resname(cons->materials[c].type, cons->materials[c].number!=1))); ch = ch+strlen(ch); } strcat(ch,"."); diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index 34d9a2036..68a0656e1 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -799,7 +799,10 @@ build_building(unit * u, const building_type * btype, int want) int n; if (c!=0) strcat(ch++, ","); n = cons->materials[c].number / cons->reqsize; - sprintf(ch, " %d %s", n?n:1, resname(cons->materials[c].type, cons->materials[c].number==1)); + sprintf(ch, " %d %s", n?n:1, + locale_string(u->faction->locale, + resname(cons->materials[c].type, cons->materials[c].number!=1)) + ); ch = ch+strlen(ch); } strcat(ch,"."); diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c index 40c6a034c..3f9aed7f4 100644 --- a/src/common/kernel/magic.c +++ b/src/common/kernel/magic.c @@ -1069,12 +1069,14 @@ cancast(unit * u, spell * sp, int level, int range, char * cmd) if (b == false) { scat(", "); icat(itemanz); - scat(resname(res, (itemanz == 1 ? 0 : 1))); + scat(locale_string(u->faction->locale, + resname(res, (itemanz == 1 ? 0 : 1)))); } else { sprintf(buf, "%s in %s: 'ZAUBER %s' Für diesen Zauber fehlen " "noch %d ", unitname(u), regionid(u->region), sp->name, itemanz); - scat(resname(res, (itemanz == 1 ? 0 : 1))); + scat(locale_string(u->faction->locale, + resname(res, (itemanz == 1 ? 0 : 1)))); b = false; } }