From 862d02504f77db7e3d1b0aa4703d418b2f9f0a65 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 28 May 2005 07:09:18 +0000 Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D52?= =?UTF-8?q?9=20Befehl=20beim=20Burgenbau=20=C3=A4ndert=20sich:=20'BURG'=20?= =?UTF-8?q?wird=20durch=20'(null)'=20ersetzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/kernel/build.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index 596b171b9..f9a1b30f5 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -801,7 +801,7 @@ build_building(unit * u, const building_type * btype, int want, order * ord) building * b = NULL; /* einmalige Korrektur */ static char buffer[8 + IDSIZE + 1 + NAMESIZE + 1]; - const char *btname = NULL; + const char * btname; order * new_order = NULL; const struct locale * lang = u->faction->locale; @@ -912,20 +912,11 @@ build_building(unit * u, const building_type * btype, int want, order * ord) newbuilding = true; } - if (newbuilding) { - if (b->type->name==NULL) { - btname = LOC(lang, b->type->_name); - } else { - btname = LOC(lang, buildingtype(b, b->size)); - if (b->type->maxsize != -1) { - want = b->type->maxsize - b->size; - } - } - } + btname = LOC(lang, btype->_name); if (want-built <= 0) { /* gebäude fertig */ - strcpy(buffer, locale_string(lang, "defaultorder")); + strcpy(buffer, LOC(lang, "defaultorder")); new_order = parse_order(buffer, lang); } else if (want!=INT_MAX) { /* reduzierte restgröße */