From 378e228707ccac3c659f566f4bfadaa30838799c Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 27 May 2001 08:37:56 +0000
Subject: [PATCH] integration von katjas patch

---
 src/common/gamecode/study.c |  7 ++++---
 src/common/kernel/save.c    |  1 +
 src/common/kernel/unit.c    |  3 ++-
 src/res/de/messages.txt     |  1 +
 src/res/de/messages.xml     | 13 +++++++++++++
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c
index b333c6bdb..dd09d222c 100644
--- a/src/common/gamecode/study.c
+++ b/src/common/gamecode/study.c
@@ -141,7 +141,7 @@ teach_unit(unit * teacher, unit * student, int teaching, skill_t sk, boolean rep
 	 * von schon gelernten Tagen zum max(30 Tage pro Mann) betragen. */
 
 	if (magic_lowskill(student)){
-		cmistake(teacher, teacher->thisorder, 274, MSG_EVENT);
+		cmistake(teacher, teacher->thisorder, 292, MSG_EVENT);
 		return 0;
 	}
 
@@ -169,9 +169,10 @@ teach_unit(unit * teacher, unit * student, int teaching, skill_t sk, boolean rep
  *		&& inside_building(student)!=NULL) */
 			&& student->building && student->building->type == &bt_academy)
 		{
-			int j = study_cost(teacher, sk);
+			int j = study_cost(student, sk);
 			j = max(50, j * 2);
-			if (get_pooled(teacher, teacher->region, R_SILVER) >= j) {		/* kann Einheit das zahlen? */
+			/* kann Einheit das zahlen? */
+			if (get_pooled(student, student->region, R_SILVER) >= j) {
 				/* Jeder Schüler zusätzlich +10 Tage wenn in Uni. */
 				a->data.i += (n / 30) * 10; /* learning erhöhen */
 				/* Lehrer zusätzlich +1 Tag pro Schüler. */
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index 6714e8fb6..96bf55767 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -608,6 +608,7 @@ is_persistent(const char *s, const struct locale *lang)
 	switch(igetkeyword(s, lang)) {
 		case K_BUY:
 		case K_SELL:
+		case K_CAST:
 		case K_KOMMENTAR:
 		case K_LIEFERE:
 		case K_RESERVE:
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index c9af27f14..6f509775c 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -729,7 +729,8 @@ transfermen(unit * u, unit * u2, int n)
 		rsetpeasants(r, rpeasants(r) + n);
 }
 
-struct building * inside_building(const struct unit * u)
+struct building * 
+inside_building(const struct unit * u)
 {
 	if (u->building==NULL) return NULL;
 
diff --git a/src/res/de/messages.txt b/src/res/de/messages.txt
index 20e7c70e8..5e6aec61b 100644
--- a/src/res/de/messages.txt
+++ b/src/res/de/messages.txt
@@ -290,6 +290,7 @@ error288;errors:0;de;{unit} in {region}: '{command}' - Wieviel sollen wir einrei
 error289;errors:0;de;{unit} in {region}: '{command}' - Tarne wie?
 error290;errors:0;de;{unit} in {region}: '{command}' - Hier wachsen keine Bäume.
 error291;errors:0;de;{unit} in {region}: '{command}' - Dies ist schon eine Mallornregion.
+error292;errors:0;de;{unit} in {region}: '{command}' - Die Einheit kann nicht unterrichtet werden.
 
 # Meldungen und Ereignisse
 msg_event;events:0;de;{string}
diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml
index f94b2c3b8..5758b89e3 100644
--- a/src/res/de/messages.xml
+++ b/src/res/de/messages.xml
@@ -116,6 +116,19 @@
 	</locale>
 </message>
 
+<message name="error292">
+	<type>
+		<arg name="unit" type="unit"></arg>
+		<arg name="region" type="region"></arg>
+		<arg name="command" type="string"></arg>
+	</type>
+	<locale name="de">
+		<nr section="errors">
+			<text>"$unit($unit) in $region($region): '$command' - Die Einheit kann nicht unterrichtet werden ."</text>
+		</nr>
+	</locale>
+</message>
+
 <message name="error4">
 	<type>
 		<arg name="unit" type="unit"></arg>