From f98661fcae5c69d1763640c901c2d202df5ebdde Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sun, 27 Jan 2002 13:46:00 +0000 Subject: [PATCH] - RACE_ADJUSTMENTS aktiviert. --- src/common/gamecode/randenc.c | 2 +- src/common/kernel/eressea.h | 1 - src/common/settings-eressea.h | 3 +-- src/common/settings-vinyambar-classic.h | 2 +- src/common/settings-vinyambar.h | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c index 72b93367c..8a394a1a5 100644 --- a/src/common/gamecode/randenc.c +++ b/src/common/gamecode/randenc.c @@ -1200,7 +1200,7 @@ randomevents(void) } for (r = regions; r; r = r->next) { -#ifndef RACE_ADJUSTMENTS +#ifdef RACE_ADJUSTMENTS == 0 /* Elfen generieren Wald, Personen in Steinkreisen können Einhörner * bekommen. */ diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index c13de6419..18a960b3e 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -34,7 +34,6 @@ /* Features currently in development (change makefile please): */ /* #define MSG_LEVELS -- msg-levels active */ -/* #define RACE_ADJUSTMENTS */ /* basic types used in the eressea "kernel" */ typedef unsigned char order_t; diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index df1afbbc4..3dde85c5a 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -22,6 +22,5 @@ #define REMOVENMRTIMEOUT 1 #define HUNGER_DISABLES_LONGORDERS 1 #define REDUCED_PEASANTGROWTH 1 -#define ELVES_NEWTREES 1 - +#define RACE_ADJUSTMENTS 1 diff --git a/src/common/settings-vinyambar-classic.h b/src/common/settings-vinyambar-classic.h index e3d3da58c..836bb003c 100644 --- a/src/common/settings-vinyambar-classic.h +++ b/src/common/settings-vinyambar-classic.h @@ -22,5 +22,5 @@ #define REMOVENMRTIMEOUT 0 #define HUNGER_DISABLES_LONGORDERS 1 #define REDUCED_PEASANTGROWTH 0 -#define ELVES_NEWTREES 0 +#define RACE_ADJUSTMENTS 0 diff --git a/src/common/settings-vinyambar.h b/src/common/settings-vinyambar.h index b73d24f9e..099de2f6e 100644 --- a/src/common/settings-vinyambar.h +++ b/src/common/settings-vinyambar.h @@ -22,5 +22,5 @@ #define REMOVENMRTIMEOUT 0 #define HUNGER_DISABLES_LONGORDERS 0 #define REDUCED_PEASANTGROWTH 0 -#define ELVES_NEWTREES 0 +#define RACE_ADJUSTMENTS 0