From 16dacfcc2a526a2e421434ec65ecb4c3bb0b802c Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 9 Mar 2003 13:29:01 +0000
Subject: [PATCH] Bessere BEKLAUE Meldung

---
 src/common/gamecode/economy.c |  8 ++------
 src/res/de/messages.xml       | 10 ++++------
 src/res/en/messages.xml       | 12 ------------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index 91fbadbeb..b55ed791b 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -804,9 +804,7 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
 	char *s;
 	int i, n;
 	const item_type * itype;
-	int notfound_error = 64;
-
-	if (liefere) notfound_error = 63;
+	int notfound_error = 63;
 
 	u2 = getunit(r, u->faction);
 
@@ -2520,6 +2518,7 @@ expandstealing(region * r, request * stealorders)
 			use_all(u, R_SILVER, n);
 			oa[i].unit->n = n;
 			change_money(oa[i].unit, n);
+			add_message(&u->faction->msgs, msg_message("stealeffect", "unit region amount", u, u->region, n));
 		}
 		add_income(oa[i].unit, IC_STEAL, oa[i].unit->wants, oa[i].unit->n);
 	}
@@ -2980,9 +2979,6 @@ steal(region * r, unit * u, request ** stealorders)
 			goblin = true;
 		}
 	}
-	add_message(&u2->faction->msgs, new_message(u2->faction,
-				"stealeffect%u:unit%r:region", u2, u2->region));
-
 	n = max(0, n);
 
 	i = min(u->number, get_item(u,I_RING_OF_NIMBLEFINGER));
diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml
index 6a42310cf..93aa261dc 100644
--- a/src/res/de/messages.xml
+++ b/src/res/de/messages.xml
@@ -4776,16 +4776,14 @@
 		</locale>
 	</message>
 
-	<message name="stealeffect">
+	<message name="stealeffect" section="events">
 		<type>
 			<arg name="unit" type="unit"></arg>
 			<arg name="region" type="region"></arg>
+			<arg name="amount" type="int"></arg>
 		</type>
-		<locale name="de">
-			<nr section="events">
-				<text>"$unit($unit) wurde in $region($region) beklaut."</text>
-			</nr>
-		</locale>
+		<text locale="de">"$unit($unit) wurden in $region($region) $int($amount) Silberstücke geklaut."</text>
+		<text locale="en">"In $region($region), thieves stole $int($amount) silver from $unit($unit)."</text>
 	</message>
 
 	<message name="newbie_immunity_error">
diff --git a/src/res/en/messages.xml b/src/res/en/messages.xml
index 8ecb01fc0..11c74b8d6 100644
--- a/src/res/en/messages.xml
+++ b/src/res/en/messages.xml
@@ -3372,18 +3372,6 @@
 		</locale>
 	</message>
 
-	<message name="stealeffect">
-		<type>
-			<arg name="unit" type="unit"></arg>
-			<arg name="region" type="region"></arg>
-		</type>
-		<locale name="en">
-			<nr section="none">
-				<text>"$unit($unit) was robbed in $region($region)."</text>
-			</nr>
-		</locale>
-	</message>
-
 	<message name="newbieimmunity">
 		<type>
 			<arg name="turns" type="int"></arg>