diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index a2c52db89..174d77fb9 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -1635,7 +1635,7 @@ order_template(FILE * F, faction * f)
}
static void
-report_alliances(const faction * f, const ally * sf)
+show_allies(const faction * f, const ally * sf)
{
int allierte = 0;
int i=0, h, hh = 0;
@@ -1718,7 +1718,7 @@ allies(FILE * F, faction * f)
} else {
strcpy(buf, "Wir helfen den Parteien ");
}
- report_alliances(f, f->allies);
+ show_allies(f, f->allies);
scat(".");
rparagraph(F, buf, 0, 0);
rnl(F);
@@ -1731,7 +1731,7 @@ allies(FILE * F, faction * f)
} else {
sprintf(buf, "%s hilft den Parteien ", g->name);
}
- report_alliances(f, g->allies);
+ show_allies(f, g->allies);
scat(".");
rparagraph(F, buf, 0, 0);
rnl(F);
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 705ad3781..551e7c070 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -114,7 +114,7 @@ dbrace(const struct race * rc)
char * zPtr = zText;
strcpy(zText, LOC(find_locale("en"), rc_name(rc, 0)));
while (*zPtr) {
- *zPtr = toupper(*zPtr);
+ *zPtr = (char)(toupper(*zPtr));
++zPtr;
}
return zText;
diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c
index c913a3788..66c3c0096 100644
--- a/src/common/kernel/magic.c
+++ b/src/common/kernel/magic.c
@@ -1581,7 +1581,7 @@ regeneration_magiepunkte(void)
reg_aura = min((auramax - aura), reg_aura);
aura += (int)reg_aura;
- add_message(&u->faction->msgs, msg_message(
+ ADDMSG(&u->faction->msgs, msg_message(
"regenaura", "unit region amount",
u, r, (int)reg_aura));
}
@@ -3013,6 +3013,8 @@ magic(void)
&& !fval(u->race, RCF_SWIM)
&& !(sp->sptyp & OCEANCASTABLE)) {
/* Fehlermeldung */
+ ADDMSG(&u->faction->msgs, msg_message("spellfail_onocean",
+ "unit region command", u, u->region, so->s));
continue;
}
/* Auf bewegenden Schiffen kann man nur explizit als
diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml
index c78927d3f..96cba0aee 100644
--- a/src/res/de/messages.xml
+++ b/src/res/de/messages.xml
@@ -3000,6 +3000,16 @@
+
+
+
+
+
+
+ "$unit($unit) in $region($region): '$command' - Dieser Zauber kann nicht auf hoher See gezaubert werden."
+ "$unit($unit) in $region($region): '$command' - This spell cannot be cast while you are on the ocean."
+
+