From 343290668af6129dde4384bebf315db9d1d0cf4b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 6 Mar 2005 16:37:10 +0000
Subject: [PATCH] =?UTF-8?q?Wenn=20gute/schlechte=20Tr=C3=A4ume=20auf=20der?=
 =?UTF-8?q?=20Region=20liegen,=20kann=20kein=20LEHRE=20gemacht=20werden=20?=
 =?UTF-8?q?(der=20Zauber=20wird=20missbraucht)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/study.c | 14 ++++++++++++--
 src/res/messages.xml        | 10 ++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c
index 5f10afef0..1e4938079 100644
--- a/src/common/gamecode/study.c
+++ b/src/common/gamecode/study.c
@@ -754,7 +754,6 @@ void
 teaching(void)
 {
 	region *r;
-	unit *u;
 	/* das sind alles befehle, die 30 tage brauchen, und die in thisorder
 	 * stehen! von allen 30-tage befehlen wird einfach der letzte verwendet
 	 * (dosetdefaults).
@@ -762,6 +761,7 @@ teaching(void)
 	 * lehren vor lernen. */
 
 	for (r = regions; r; r = r->next) {
+    unit *u;
 
 		for (u = r->units; u; u = u->next) {
 
@@ -783,7 +783,17 @@ teaching(void)
 				if (attacked(u)){
 					cmistake(u, u->thisorder, 52, MSG_PRODUCE);
 					continue;
-				}
+				} else {
+          static const curse_type * gbdream_ct = NULL;
+          if (gbdream_ct==0) gbdream_ct = ct_find("gbdream");
+          if (gbdream_ct) {
+            if (get_curse(u->region->attribs, gbdream_ct)) {
+              ADDMSG(&u->faction->msgs, 
+                msg_feedback(u, u->thisorder, "gbdream_noteach", ""));
+              continue;
+            }
+          }
+        }
 				teach(u, u->thisorder);
 				break;
 			}
diff --git a/src/res/messages.xml b/src/res/messages.xml
index 782bba650..5f1126437 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -3359,6 +3359,16 @@
     </type>
     <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Im astralen Nebel konnte niemand entdeckt werden."</text>
   </message>
+  <message name="gbdream_noteach" section="errors">
+    <type>
+      <arg name="unit" type="unit"/>
+      <arg name="region" type="region"/>
+      <arg name="command" type="order"/>
+    </type>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Ein Zauber in dieser Region verhindert das."</text>
+    <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - There is an active spell in this region that prevents this."</text>
+    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - There is an active spell in this region that prevents this."</text>
+  </message>
   <message name="error218" section="errors">
     <type>
       <arg name="unit" type="unit"/>