From 3b886bb875eca9ad07bd267d34d26f3acacab38c Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sun, 23 Dec 2001 12:15:56 +0000 Subject: [PATCH] - Diverses --- src/common/gamecode/laws.c | 2 +- src/common/settings-eressea.h | 2 +- src/common/settings-vinyambar-classic.h | 2 +- src/common/settings-vinyambar.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index efd3f2c78..e789cc88c 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -3001,7 +3001,7 @@ setdefaults (void) case K_WORK: case K_DRIVE: case K_MOVE: - if(fval(u, FL_HUNGER)) { + if(!global.disabled[K_WORK] && fval(u, FL_HUNGER)) { set_string(&u->thisorder, locale_string(u->faction->locale, "defaultorder")); } else { set_string(&u->thisorder, S->s); diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index c6540c150..7c5ec71ac 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -18,4 +18,4 @@ #define NEW_RESOURCEGROWTH 1 #define LARGE_CASTLES 1 #define GROWING_TREES 1 -#define REMOVENMRNEWBIE 1 +#define REMOVENMRNEWBIE diff --git a/src/common/settings-vinyambar-classic.h b/src/common/settings-vinyambar-classic.h index 372333cac..409a8c0a7 100644 --- a/src/common/settings-vinyambar-classic.h +++ b/src/common/settings-vinyambar-classic.h @@ -18,4 +18,4 @@ #define NEW_RESOURCEGROWTH 0 #define LARGE_CASTLES 0 #define GROWING_TREES 0 -#define REMOVENMRNEWBIE 0 +#undef REMOVENMRNEWBIE diff --git a/src/common/settings-vinyambar.h b/src/common/settings-vinyambar.h index 118e99374..c7500f76e 100644 --- a/src/common/settings-vinyambar.h +++ b/src/common/settings-vinyambar.h @@ -11,11 +11,11 @@ */ /* - * Contains defines for the "free" game (Eressea) . + * Contains defines for the "modern" vinyambar game. * Include this file from settings.h to make eressea work. */ #define RESOURCE_CONVERSION 1 #define NEW_RESOURCEGROWTH 1 #define LARGE_CASTLES 1 #define GROWING_TREES 1 -#define REMOVENMRNEWBIE 0 +#undef REMOVENMRNEWBIE