From b0a986e1555784a1e95d30d847a484679d24af49 Mon Sep 17 00:00:00 2001 From: Philipp Dreher Date: Fri, 6 Nov 2015 20:57:19 +0100 Subject: [PATCH] Revert "added a lua-test" This reverts commit a452ad1517ebe5b2eb05c665ca858a0ca8115c48. --- scripts/tests/e3/castles.lua | 23 ----------------------- src/kernel/build.c | 4 +--- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/scripts/tests/e3/castles.lua b/scripts/tests/e3/castles.lua index b32f80f5d..b9cbabe0b 100644 --- a/scripts/tests/e3/castles.lua +++ b/scripts/tests/e3/castles.lua @@ -50,26 +50,3 @@ function test_build_packice() process_orders() assert_equal(nil, u.building) end - -function test_build_castle_stages() - local r = region.create(0,0, "plain") - local f = faction.create("castle@eressea.de", "human", "de") - local u = unit.create(f, r, 1000) - local b = building.create(r, "castle") - - u:add_item("stone", 1000) - - u:set_skill("building", 1) - u:clear_orders() - - u:add_order("MACHE BURG " .. itoa36(b.id)) - process_orders() - assert_equal(10, b.size) - - u:set_skill("building", 3) - u:clear_orders() - - u:add_order("MACHE BURG " .. itoa36(b.id)) - process_orders() - assert_equal(250, b.size) -end diff --git a/src/kernel/build.c b/src/kernel/build.c index 3952c732a..e38d76641 100644 --- a/src/kernel/build.c +++ b/src/kernel/build.c @@ -522,9 +522,7 @@ int build(unit * u, const construction * ctype, int completed, int want) if (basesk < type->minskill) { if (made == 0) - return ELOWSKILL; - else - return made; /* not good enough to go on */ + return ELOWSKILL; /* not good enough to go on */ } /* n = maximum buildable size */