diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index 084c66617..37d5ff80b 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -114,7 +114,7 @@ NewbieImmunity(void) { static int value = -1; if (value<0) { const char * str = get_param(global.parameters, "NewbieImmunity"); - value = str?atoi(str):IMMUN_GEGEN_ANGRIFF; + value = str?atoi(str):0; } return value; } @@ -2664,11 +2664,6 @@ lifestyle(const unit * u) astralspace = getplanebyname("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/eressea.h b/src/common/kernel/eressea.h index 70deb9c45..a12c4edc3 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -185,7 +185,9 @@ struct building_type; # define RELEASE_VERSION ATTRIBREAD_VERSION #endif -#if RESOURCE_CONVERSION +#define RESOURCE_CONVERSION + +#ifdef RESOURCE_CONVERSION extern void init_resourcefix(void); extern void read_iron(struct region * r, int iron); extern void read_laen(struct region * r, int laen); diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index 66b1c5e17..e8f39b4a8 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -85,7 +85,7 @@ int firstx = 0, firsty = 0; static region * current_region; -#if RESOURCE_CONVERSION +#ifdef RESOURCE_CONVERSION int laen_read(attrib * a, FILE * F) { int laen; @@ -750,7 +750,7 @@ read_items(FILE *F, item **ilist) } } -#if RESOURCE_CONVERSION +#ifdef RESOURCE_CONVERSION struct attrib_type at_resources = { "resources", NULL, NULL, NULL, NULL, NULL, ATF_UNIQUE }; @@ -1299,7 +1299,7 @@ readregion(FILE * F, short x, short y) i = ri(F); rsethorses(r, i); if (global.data_version < NEWRESOURCE_VERSION) { i = ri(F); -#if RESOURCE_CONVERSION +#ifdef RESOURCE_CONVERSION if (i!=0) read_iron(r, i); #endif } else { diff --git a/src/common/kernel/save.h b/src/common/kernel/save.h index b638fd08c..550420868 100644 --- a/src/common/kernel/save.h +++ b/src/common/kernel/save.h @@ -56,7 +56,7 @@ extern void write_items(FILE *f, struct item *it); extern const char * datapath(void); -#if RESOURCE_CONVERSION +#ifdef RESOURCE_CONVERSION extern struct attrib_type at_resources; #endif diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index fd2b8abed..5f18eb286 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -15,17 +15,13 @@ * Include this file from settings.h to make eressea work. */ #define ENTERTAINFRACTION 20 -#define IMMUN_GEGEN_ANGRIFF 8 -#define RESOURCE_CONVERSION 1 #define TEACHDIFFERENCE 2 -#define PEASANT_ADJUSTMENT 1 #define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ #define COMBAT_TURNS 5 #define NEW_MIGRATION 1 -#define ASTRAL_HUNGER #define NEWATSROI 0 /* Vermehrungsrate Bauern in 1/10000. diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h index d44677c2f..bc1e6f2a7 100644 --- a/src/common/settings-tutorial.h +++ b/src/common/settings-tutorial.h @@ -15,17 +15,13 @@ * Include this file from settings.h to make eressea work. */ #define ENTERTAINFRACTION 20 -#define IMMUN_GEGEN_ANGRIFF 8 -#define RESOURCE_CONVERSION 1 #define TEACHDIFFERENCE 2 -#define PEASANT_ADJUSTMENT 1 #define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ #define COMBAT_TURNS 5 #define NEW_MIGRATION 1 -#define ASTRAL_HUNGER #define NEWATSROI 0 /* Vermehrungsrate Bauern in 1/10000. diff --git a/src/common/settings-vinyambar-3.h b/src/common/settings-vinyambar-3.h index b233488e6..7fa61d879 100644 --- a/src/common/settings-vinyambar-3.h +++ b/src/common/settings-vinyambar-3.h @@ -15,10 +15,7 @@ * Include this file from settings.h to make eressea work. */ #define ENTERTAINFRACTION 20 -#define IMMUN_GEGEN_ANGRIFF 8 -#define RESOURCE_CONVERSION 1 #define TEACHDIFFERENCE 2 -#define PEASANT_ADJUSTMENT 1 #define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h index 8018ede6f..e74c39086 100644 --- a/src/common/settings-wdw.h +++ b/src/common/settings-wdw.h @@ -15,17 +15,13 @@ * Include this file from settings.h to make eressea work. */ #define ENTERTAINFRACTION 20 -#define IMMUN_GEGEN_ANGRIFF 8 -#define RESOURCE_CONVERSION 1 #define TEACHDIFFERENCE 2 -#define PEASANT_ADJUSTMENT 1 #define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 0.5 #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ #define COMBAT_TURNS 5 #define NEW_MIGRATION 1 -#define ASTRAL_HUNGER /* Vermehrungsrate Bauern in 1/10000. * Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */ diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index dbb0a9830..66cab9eed 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -449,7 +449,6 @@ get_timeout(trigger * td, trigger * tfind) #include #include -#if RESOURCE_CONVERSION extern struct attrib_type at_resources; void init_resourcefix(void) @@ -457,8 +456,6 @@ init_resourcefix(void) at_register(&at_resources); } -#endif - int growing_trees(void) { diff --git a/src/res/eressea.xml b/src/res/eressea.xml index ef51ae305..f126e5105 100644 --- a/src/res/eressea.xml +++ b/src/res/eressea.xml @@ -53,6 +53,7 @@ + diff --git a/src/res/tutorial.xml b/src/res/tutorial.xml index 8d3e77a3e..1f2c5d650 100644 --- a/src/res/tutorial.xml +++ b/src/res/tutorial.xml @@ -54,6 +54,7 @@ +