From 89fb44caa3c3f5e213ddf0e69362fc794a0b0f84 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 17 Dec 2003 00:47:24 +0000 Subject: [PATCH] Eressea, WdW und Tutorial mit Unterhaltszahlungen im Astralraum --- src/common/gamecode/gamecode.vcproj | 1 + src/common/kernel/eressea.c | 5 +++-- src/common/kernel/kernel.vcproj | 3 --- src/common/settings-eressea.h | 2 +- src/common/settings-tutorial.h | 1 + src/common/settings-wdw.h | 1 + src/eressea/eressea.vcproj | 1 + 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/common/gamecode/gamecode.vcproj b/src/common/gamecode/gamecode.vcproj index fd629c312..ce854f405 100644 --- a/src/common/gamecode/gamecode.vcproj +++ b/src/common/gamecode/gamecode.vcproj @@ -3,6 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="gamecode" + ProjectGUID="{836AC507-A3BD-4F6A-8362-BEBC3EA41CC2}" SccProjectName="" SccLocalPath=""> diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index 577625432..6bd5ae6df 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -2498,10 +2498,11 @@ lifestyle(const unit * u) astralspace = getplanebyname("Astralraum"); } - /* Keinen Unterhalt im Astralraum. */ +#ifndef ASTRAL_HUNGER + /* Keinen Unterhalt im Astralraum. */ if (getplane(u->region) == astralspace) return 0; - +#endif if(u->region->planep && fval(u->region->planep, PFL_NOFEED)) return 0; diff --git a/src/common/kernel/kernel.vcproj b/src/common/kernel/kernel.vcproj index 4e159285e..56099adfa 100644 --- a/src/common/kernel/kernel.vcproj +++ b/src/common/kernel/kernel.vcproj @@ -245,9 +245,6 @@ - - diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index bf0c7dd52..07dd40f86 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -34,7 +34,7 @@ #define COMBAT_TURNS 5 #define PEASANTS_DO_NOT_STARVE 0 #define NEW_MIGRATION 1 - +#define ASTRAL_HUNGER #undef SHORTPWDS #define ZEROFOKS_QUESTMASTER "eressea@zerofoks.net" diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h index 8df4fd2d9..9e2bd3791 100644 --- a/src/common/settings-tutorial.h +++ b/src/common/settings-tutorial.h @@ -34,5 +34,6 @@ #define COMBAT_TURNS 5 #define PEASANTS_DO_NOT_STARVE 0 #define NEW_MIGRATION 1 +#define ASTRAL_HUNGER #define MAILITPATH "/usr/sbin:$HOME/tutorial/bin:/bin:/usr/bin:/usr/local/bin" diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h index fe9fc20bb..8991ed0ba 100644 --- a/src/common/settings-wdw.h +++ b/src/common/settings-wdw.h @@ -37,6 +37,7 @@ #define MIGRANTS_CAN_LEARN_EXPENSIVE_SKILLS 1 /* vinyambar 3 only */ #define MAGICPOWER 0.5 #define MAGICREGEN 0.5 +#define ASTRAL_HUNGER #define RESOURCE_FACTOR 0.25 #if NEWATSROI == 1 diff --git a/src/eressea/eressea.vcproj b/src/eressea/eressea.vcproj index d73b65c25..417e13f76 100644 --- a/src/eressea/eressea.vcproj +++ b/src/eressea/eressea.vcproj @@ -3,6 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="eressea" + ProjectGUID="{749A2F7C-B9C3-4CEB-B1B2-1D4587E68718}" SccProjectName="" SccLocalPath="">