diff --git a/src/common/kernel/give.c b/src/common/kernel/give.c
index 2f80fda15..70878cfcb 100644
--- a/src/common/kernel/give.c
+++ b/src/common/kernel/give.c
@@ -171,7 +171,8 @@ give_men(int n, unit * u, unit * u2, struct order * ord)
} else if (u2 && (fval(u2, UFL_LOCKED)|| is_cursed(u2->attribs, C_SLAVE, 0))) {
error = 75;
} else if (u2 && u2->faction != u->faction && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) {
- error = 73;
+ ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_no_contact", "target", u2));
+ error = -1;
} else if (u2 && (has_skill(u, SK_MAGIC) || has_skill(u2, SK_MAGIC))) {
error = 158;
} else if (u2 && fval(u, UFL_WERE) != fval(u2, UFL_WERE)) {
@@ -269,7 +270,7 @@ give_men(int n, unit * u, unit * u2, struct order * ord)
}
}
}
- if (error) {
+ if (error>0) {
cmistake(u, ord, error, MSG_COMMERCE);
}
else if (!u2 || u2->faction!=u->faction) {
@@ -333,7 +334,7 @@ give_unit(unit * u, unit * u2, order * ord)
}
if (!alliedunit(u2, u->faction, HELP_GIVE) && ucontact(u2, u) == 0) {
- cmistake(u, ord, 73, MSG_COMMERCE);
+ ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_no_contact", "target", u2));
return;
}
if (u->number == 0) {
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 5dc0c366d..579c499ab 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -1787,7 +1787,7 @@ sp_treewalkenter(castorder *co)
}
if (!ucontact(u, mage)) {
- cmistake(mage, co->order, 73, MSG_MAGIC);
+ ADDMSG(&mage->faction->msgs, msg_feedback(mage, ord, "feedback_no_contact", "target", u));
} else {
int w;
diff --git a/src/res/messages.xml b/src/res/messages.xml
index a892e2e8a..3babb579b 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -5193,25 +5193,16 @@
"$unit($unit) in $region($region): '$order($command)' - This unit cannot give anybody away."
"$unit($unit) in $region($region): '$order($command)' - This unit cannot give anybody away."
-
+
+
- "$unit($unit) in $region($region): '$order($command)' - Die Zieleinheit hat uns nicht kontaktiert."
- "$unit($unit) in $region($region): '$order($command)' - The target-unit did not contact us."
- "$unit($unit) in $region($region): '$order($command)' - The target-unit did not contact us."
-
-
-
-
-
-
-
- "$unit($unit) in $region($region): '$order($command)' - Die Ziel-Einheit hat keinen Kontakt mit uns aufgenommen."
- "$unit($unit) in $region($region): '$order($command)' - The target-unit did not contact us."
- "$unit($unit) in $region($region): '$order($command)' - The target-unit did not contact us."
+ "$unit($unit) in $region($region): '$order($command)' - $unit($target) hat keinen Kontakt mit uns aufgenommen."
+ "$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us."
+ "$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us."