From ed75f4d21a6b1bedc0e5d530abc1fc38bbc8150b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 17 Dec 2017 14:28:15 +0100 Subject: [PATCH] fix bug 2389 (sailing into glaciers). reduce verbosity. --- scripts/tests/e2/insects.lua | 2 +- src/kernel/save.c | 2 +- src/move.c | 15 --------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/scripts/tests/e2/insects.lua b/scripts/tests/e2/insects.lua index 4dcc2898b..bfd0a2065 100644 --- a/scripts/tests/e2/insects.lua +++ b/scripts/tests/e2/insects.lua @@ -34,7 +34,7 @@ function test_sail_into_glacier() u1:add_order("NACH OST") u2.ship = u1.ship process_orders() - assert_equal(r, u2.region) + assert_equal(r2, u2.region) end function test_recruit_in_winter() diff --git a/src/kernel/save.c b/src/kernel/save.c index fe83f943a..2a5740312 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1429,7 +1429,7 @@ int read_game(gamedata *data) /* Burgen */ READ_INT(store, &p); if (p > 0 && !r->land) { - log_error("%s, uid=%d has %d %s", regionname(r, NULL), r->uid, p, (p==1) ? "building" : "buildings"); + log_debug("%s, uid=%d has %d %s", regionname(r, NULL), r->uid, p, (p==1) ? "building" : "buildings"); } bp = &r->buildings; diff --git a/src/move.c b/src/move.c index 69a84c2cd..4cc15c9bf 100644 --- a/src/move.c +++ b/src/move.c @@ -677,21 +677,6 @@ int check_ship_allowed(struct ship *sh, const region * r) int c = 0; const building_type *bt_harbour = bt_find("harbour"); - if (sh->region && r_insectstalled(r)) { - /* insekten dürfen nicht hier rein. haben wir welche? */ - unit *u; - - for (u = sh->region->units; u != NULL; u = u->next) { - if (u->ship != sh) { - continue; - } - - if (is_freezing(u)) { - return SA_NO_INSECT; - } - } - } - if (bt_harbour && buildingtype_exists(r, bt_harbour, true)) { unit* harbourmaster = NULL; harbourmaster = owner_buildingtyp(r, bt_harbour);