Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug 2389 (sailing into glaciers). 

reduce verbosity.
This commit is contained in:
Enno Rehling 2017-12-17 14:28:15 +01:00
parent 3685bcabfb
commit ed75f4d21a
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tests/e2/insects.lua
View File

@ -34,7 +34,7 @@ function test_sail_into_glacier()
u1:add_order("NACH OST") u1:add_order("NACH OST")
u2.ship = u1.ship u2.ship = u1.ship
process_orders() process_orders()
assert_equal(r, u2.region) assert_equal(r2, u2.region)
end end
function test_recruit_in_winter() function test_recruit_in_winter()

2
src/kernel/save.c
View File

@ -1429,7 +1429,7 @@ int read_game(gamedata *data)
/* Burgen */ /* Burgen */
READ_INT(store, &p); READ_INT(store, &p);
if (p > 0 && !r->land) { 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; bp = &r->buildings;

15
src/move.c
View File

@ -677,21 +677,6 @@ int check_ship_allowed(struct ship *sh, const region * r)
int c = 0; int c = 0;
const building_type *bt_harbour = bt_find("harbour"); 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)) { if (bt_harbour && buildingtype_exists(r, bt_harbour, true)) {
unit* harbourmaster = NULL; unit* harbourmaster = NULL;
harbourmaster = owner_buildingtyp(r, bt_harbour); harbourmaster = owner_buildingtyp(r, bt_harbour);