From 030832c20e467c2bb7c85cbacb21a585df2ce1de Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 14 Sep 2009 21:55:15 +0000 Subject: [PATCH] http://bugs.eressea.de/view.php?id=1614 MACHEN 3 WACHE --- src/common/kernel/build.c | 4 ++-- src/common/kernel/unit.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index 6cac08448..ab90e311d 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -954,10 +954,10 @@ build_building(unit * u, const building_type * btype, int want, order * ord) btname = LOC(lang, btype->_name); - if (n-built <= 0) { + if (want-built <= 0) { /* gebäude fertig */ new_order = default_order(lang); - } else if (n!=INT_MAX) { + } else if (want!=INT_MAX) { /* reduzierte restgröße */ const char * hasspace = strchr(btname, ' '); if (hasspace) { diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c index e9167de6f..91e6533fc 100644 --- a/src/common/kernel/unit.c +++ b/src/common/kernel/unit.c @@ -842,7 +842,6 @@ can_leave(unit * u) boolean leave(unit * u, boolean force) { - if (!force) { if (!can_leave(u)) return false; }