diff --git a/clibs b/clibs
index 1854780fe..696505016 160000
--- a/clibs
+++ b/clibs
@@ -1 +1 @@
-Subproject commit 1854780fe3073e491775836c22f709668b1fff62
+Subproject commit 6965050165efdae89305a13bff06283229f143f4
diff --git a/res/core/ships.xml b/res/core/ships.xml
index d26975285..48e77dec6 100644
--- a/res/core/ships.xml
+++ b/res/core/ships.xml
@@ -8,6 +8,13 @@
+
+
+
+
+
+
+
diff --git a/res/translations/strings.de.po b/res/translations/strings.de.po
index 8720fc85d..5884eda83 100644
--- a/res/translations/strings.de.po
+++ b/res/translations/strings.de.po
@@ -1707,6 +1707,9 @@ msgstr "Ring der Unsichtbarkeit"
msgid "caravel_a"
msgstr "eine Karavelle"
+msgid "galleon_a"
+msgstr "eine Galleone"
+
msgctxt "keyword"
msgid "describe"
msgstr "BESCHREIBE"
@@ -2064,6 +2067,9 @@ msgstr "Wir schreiben %s des Monats %s im Jahre %d %s."
msgid "caravel"
msgstr "Karavelle"
+msgid "galleon"
+msgstr "Galleone"
+
msgid "dragon_postfix_10"
msgstr "der Goldene"
diff --git a/res/translations/strings.en.po b/res/translations/strings.en.po
index d096a77ae..13badb9cb 100644
--- a/res/translations/strings.en.po
+++ b/res/translations/strings.en.po
@@ -1458,6 +1458,12 @@ msgstr "DESCRIBE"
msgid "roi"
msgstr "ring of invisibility"
+msgid "galleon_a"
+msgstr "a galleon"
+
+msgid "galleon"
+msgstr "galleon"
+
msgid "caravel_a"
msgstr "a caravel"
diff --git a/scripts/eressea/xmasitems.lua b/scripts/eressea/xmasitems.lua
index 3771553b5..2d8f397a1 100644
--- a/scripts/eressea/xmasitems.lua
+++ b/scripts/eressea/xmasitems.lua
@@ -37,6 +37,7 @@ function use_snowglobe(u, amount, token, ord)
local transform = {
ocean = "glacier",
firewall = "volcano",
+ activevolcano = "volcano",
volcano = "mountain",
desert = "plain"
}
diff --git a/src/economy.c b/src/economy.c
index 906019d3c..829b205a1 100644
--- a/src/economy.c
+++ b/src/economy.c
@@ -1989,7 +1989,7 @@ static void expandentertainment(region * r, econ_request *ecbegin, econ_request
assert(total == 0);
}
-int entertain_cmd(unit * u, struct order *ord, econ_request **io_req)
+static int entertain_cmd(unit * u, struct order *ord, econ_request **io_req)
{
region *r = u->region;
int wants, max_e;
diff --git a/src/report.c b/src/report.c
index 06b8fa7fd..e73760229 100644
--- a/src/report.c
+++ b/src/report.c
@@ -1592,6 +1592,8 @@ static void allies(struct stream *out, const faction * f)
const group *g = f->groups;
char prefix[64];
+ rpline(out);
+ newline(out);
centre(out, LOC(f->locale, "nr_alliances"), false);
newline(out);
@@ -1678,6 +1680,8 @@ static void list_address(struct stream *out, const faction * uf, selist * seenfa
int qi = 0;
selist *flist = seenfactions;
+ rpline(out);
+ newline(out);
centre(out, LOC(uf->locale, "nr_addresses"), false);
newline(out);
diff --git a/src/reports.c b/src/reports.c
index 048233254..6e735223e 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -1293,6 +1293,9 @@ static void add_seen_lighthouse(region *r, faction *f)
if (r->terrain->flags & SEA_REGION) {
add_seen_nb(f, r, seen_lighthouse);
}
+ else {
+ add_seen_nb(f, r, seen_neighbour);
+ }
}
/** mark all regions seen by the lighthouse.