From bcab633424ba7817b879e52d7fd4bf93f0d745af Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sat, 25 Sep 2004 10:26:30 +0000
Subject: [PATCH] =?UTF-8?q?WDW:=20Talenthalbierung=20bei=20D=C3=A4monen,?=
 =?UTF-8?q?=20die=20keine=20Bauern=20bekommen,=20rausgenommen.=20=20=20=20?=
 =?UTF-8?q?=20=20(Spielerprotest)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/laws.c    | 5 +++++
 src/common/kernel/eressea.h   | 1 -
 src/common/kernel/give.c      | 2 ++
 src/common/settings-eressea.h | 3 +++
 src/common/settings-wdw.h     | 6 ++++++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index eb37662e4..cbf6ad63d 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -270,7 +270,12 @@ get_food(region *r)
 				}
 				if (hungry > 0) {
           /* nicht gefütterte dämonen hungern */
+#ifdef PEASANT_HUNGRY_DAEMONS_HAVE_FULL_SKILLS
+					/* wdw special rule */
+					hunger(hungry, u);
+#else
           if (hunger(hungry, u)) fset(u, UFL_HUNGER);
+#endif
 					/* used to be: hunger(hungry, u); */
 				}
 			}
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index af4f0f10e..bcd253294 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -98,7 +98,6 @@ struct building_type;
 #undef WEATHER        /* Kein Wetter-Modul */
 #define NEW_DRIVE     /* Neuer Algorithmus Transportiere/Fahre */
 #define PARTIAL_STUDY /* Wenn nicht genug Silber vorhanden, wird ein Talent anteilig gelernt */
-#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert auf die Hälfte */
 #define NEW_RECEIPIES /* Vereinfachte, besser verteilte Kräuterzutaten für Tränke */
 #define GOBLINKILL
 
diff --git a/src/common/kernel/give.c b/src/common/kernel/give.c
index 927b7c181..cf190ec2a 100644
--- a/src/common/kernel/give.c
+++ b/src/common/kernel/give.c
@@ -232,8 +232,10 @@ give_men(int n, unit * u, unit * u2, struct order * ord)
       set_racename(&u2->attribs, get_racename(u->attribs));
       u2->race = u->race;
       u2->irace = u->irace;
+#ifdef HEROES
       if (fval(u, UFL_HERO)) fset(u2, UFL_HERO);
       else freset(u2, UFL_HERO);
+#endif
     }
     
     if (u2) {
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index 7dce07264..8b59097e4 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -36,6 +36,9 @@
 #define ASTRAL_HUNGER
 #define NEWATSROI 0
 
+#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert
+																auf die Hälfte */
+
 #define MUSEUM_MODULE
 #define ARENA_MODULE
 #define WORMHOLE_MODULE
diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h
index e1eb4ba65..b6701c764 100644
--- a/src/common/settings-wdw.h
+++ b/src/common/settings-wdw.h
@@ -35,6 +35,12 @@
 #define NEW_MIGRATION 1
 #define ASTRAL_HUNGER
 
+#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert
+                                auf die Hälfte */
+
+#define PEASANT_HUNGRY_DAEMONS_HAVE_FULL_SKILLS
+
+
 #define NEWATSROI 1
 #if NEWATSROI == 1
 #define ATSBONUS 2