Merge remote-tracking branch 'upstream/develop' into develop

process/accept-orders.py

@@ -52,7 +52,7 @@ hostname = socket.gethostname()
 orderbase = "orders.dir"
 sendmail = True
 # maximum number of reports per sender:
-maxfiles = 30
+maxfiles = 50
 # write headers to file?
 writeheaders = True
 # reject all html email?

process/orders-accept

@@ -17,10 +17,13 @@ mkdir -p orders.dir
 cd orders.dir
 lockfile -r3 -l120 "$LOCKFILE"
 eval "$(python "$BIN/accept-orders.py" "$@")"
-rm -f "$LOCKFILE"
-filename=$(basename "$ACCEPT_FILE")
-email="$ACCEPT_MAIL"
-if [ -d "$ERESSEA/orders-php" ]
+if [ -e "$ACCEPT_FILE" ]
 then
+	rm -f "$LOCKFILE"
+	filename=$(basename "$ACCEPT_FILE")
+	email="$ACCEPT_MAIL"
+	if [ -d "$ERESSEA/orders-php" ]
+	then
 	  php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email"
+	fi
 fi

res/translations/strings.en.po

@@ -5515,7 +5515,7 @@ msgstr "aquarians"
 
 msgctxt "iteminfo"
 msgid "fairyboot"
-msgstr "These leather boots are embroidere with unicorn hair and allow their wearer to walk at twice his normal speed."
+msgstr "These leather boots are embroidered with unicorn hair and allow their wearer to walk at twice his normal speed."
 
 msgctxt "spell"
 msgid "skillmod"

scripts/tests/e2/buildings.lua

@@ -29,6 +29,25 @@ function test_castle_names()
     assert_equal("citadel", b:get_typename(6250))
 end
 
+function test_build_tunnel_limited()
+    -- bug 2221
+    local r = region.create(0, 0, "plain")
+    local b = building.create(r, "tunnel")
+    local f = faction.create('human')
+    local u = unit.create(f, r, 2)
+    u:set_skill('building', 6, true)
+    u:add_item('stone', 22)
+    u:add_item('log', 10)
+    u:add_item('iron', 2)
+    u:add_item('money', 700)
+    u.building = b
+    u.name = 'Xolgrim'
+    u:add_order('MACHE 2 BURG ' .. itoa36(b.id))
+    b.size = 99
+    process_orders()
+    assert_equal(100, b.size)
+end
+
 function test_build_castle_one_stage()
     local r = region.create(0, 0, 'plain')
     local f = faction.create('human')

scripts/tests/e2/init.lua

@@ -1,4 +1,5 @@
 require 'tests.e2.trees'
+require 'tests.e2.buildings'
 require 'tests.e2.allies'
 require 'tests.e2.quit'
 require 'tests.e2.movement'
@@ -8,7 +9,6 @@ require 'tests.e2.astral'
 require 'tests.e2.spells'
 require 'tests.e2.e2features'
 require 'tests.e2.insects'
-require 'tests.e2.buildings'
 require 'tests.e2.production'
 require 'tests.e2.adamantium'
 require 'tests.e2.undead'

src/kernel/build.c

@@ -810,25 +810,13 @@ build_building(unit * u, const building_type * btype, int id, int want, order *
         }
         built = b->size;
     }
-    if (n <= 0 || n == INT_MAX) {
-        if (b == NULL) {
-            if (btype->maxsize > 0) {
-                n = btype->maxsize - built;
-            }
-            else {
-                n = INT_MAX;
-            }
-        }
-        else {
-            if (b->type->maxsize > 0) {
-                n = b->type->maxsize - built;
-            }
-            else {
-                n = INT_MAX;
-            }
-        }
-    }
 
+    if (btype->maxsize > 0) {
+        int remain = btype->maxsize - built;
+        if (remain < n) {
+            n = remain;
+        }
+    }
     built = build_stages(u, btype, built, n, basesk, &skills);
 
     if (built < 0) {

src/kernel/version.c

@@ -8,7 +8,7 @@
 
 #ifndef ERESSEA_VERSION
 /* the version number, if it was not passed to make with -D */
-#define ERESSEA_VERSION "3.22.0"
+#define ERESSEA_VERSION "3.23.0"
 #endif
 
 const char *eressea_version(void) {