From b524e7e3921f1394162a3624fe696dfd8100a43a Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 29 Jan 2006 00:28:46 +0000
Subject: [PATCH] move study.h where it belongs tutorial gets a "defaultorder"
 string

---
 src/common/gamecode/study.c             | 14 +++++++-------
 src/common/{kernel => gamecode}/study.h |  0
 src/res/eressea/en/strings.xml          |  2 +-
 src/res/tutorial.xml                    |  8 ++++++++
 4 files changed, 16 insertions(+), 8 deletions(-)
 rename src/common/{kernel => gamecode}/study.h (100%)

diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c
index ebd9c8a11..920850c38 100644
--- a/src/common/gamecode/study.c
+++ b/src/common/gamecode/study.c
@@ -264,7 +264,7 @@ teach(unit * u, struct order * ord)
     teaching -= i * 30;
     change_effect(u, oldpotiontype[P_FOOL], -i);
     j = teaching / 30;
-    add_message(&u->faction->msgs, msg_message("teachdumb",
+    ADDMSG(&u->faction->msgs, msg_message("teachdumb",
       "teacher amount", u, j));
   }
   if (teaching == 0) return;
@@ -385,7 +385,7 @@ teach(unit * u, struct order * ord)
       strcat(zOrder, unitid(u2));
 
       if (get_keyword(u2->thisorder) != K_STUDY) {
-        add_message(&u->faction->msgs,
+        ADDMSG(&u->faction->msgs,
           msg_feedback(u, ord, "teach_nolearn", "student", u2));
         continue;
       }
@@ -398,14 +398,14 @@ teach(unit * u, struct order * ord)
       parser_popstate();
 
       if (sk == NOSKILL) {
-        add_message(&u->faction->msgs,
+        ADDMSG(&u->faction->msgs,
           msg_feedback(u, ord, "teach_nolearn", "student", u2));
         continue;
       }
 
       /* u is teacher, u2 is student */
       if (eff_skill_study(u2, sk, r) > eff_skill_study(u, sk, r)-TEACHDIFFERENCE) {
-        add_message(&u->faction->msgs,
+        ADDMSG(&u->faction->msgs,
           msg_feedback(u, ord, "teach_asgood", "student", u2));
         continue;
       }
@@ -632,7 +632,7 @@ learn(void)
         }
         if (money>0) {
           use_pooled(u, oldresourcetype[R_SILVER], GET_DEFAULT, money);
-          add_message(&u->faction->msgs, msg_message("studycost",
+          ADDMSG(&u->faction->msgs, msg_message("studycost",
             "unit region cost skill", u, u->region, money, sk));
         }
 
@@ -700,9 +700,9 @@ learn(void)
             while (teach->teachers[index] && index!=MAXTEACHERS) {
               unit * teacher = teach->teachers[index++];
               if (teacher->faction != u->faction) {
-                add_message(&u->faction->msgs, msg_message("teach_student",
+                ADDMSG(&u->faction->msgs, msg_message("teach_student",
                   "teacher student skill", teacher, u, sk));
-                add_message(&teacher->faction->msgs, msg_message("teach_teacher",
+                ADDMSG(&teacher->faction->msgs, msg_message("teach_teacher",
                   "teacher student skill level", teacher, u, sk,
                   effskill(u, sk)));
               }
diff --git a/src/common/kernel/study.h b/src/common/gamecode/study.h
similarity index 100%
rename from src/common/kernel/study.h
rename to src/common/gamecode/study.h
diff --git a/src/res/eressea/en/strings.xml b/src/res/eressea/en/strings.xml
index e87c445f3..a4306476d 100644
--- a/src/res/eressea/en/strings.xml
+++ b/src/res/eressea/en/strings.xml
@@ -6,6 +6,6 @@
   		<text locale="en">With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.</text>
 	</string>
 	<string name="defaultorder">
-		<text locale="en">WORK</text>
+		<text locale="en">WORKWORK</text>
 	</string>
 </strings>
diff --git a/src/res/tutorial.xml b/src/res/tutorial.xml
index fe2eb2d8e..8d87eddad 100644
--- a/src/res/tutorial.xml
+++ b/src/res/tutorial.xml
@@ -77,4 +77,12 @@
       <text locale="en">ERESSEA ORDERS</text>
     </string>
   </strings>
+
+  <string name="defaultorder">
+    <text locale="de">ARBEITE</text>
+  </string>
+  <string name="defaultorder">
+    <text locale="en">WORK</text>
+  </string>
+
 </eressea>