From 8e0c56083988437401c7a3c2bed192f4b44736f4 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Feb 2010 00:35:39 +0000 Subject: [PATCH] this compiles, but it's broken in a number of ways (spells) --- src/common/build/gamecode.c | 6 +++--- src/common/kernel/eressea.h | 2 ++ src/common/spells/regioncurse.h | 3 --- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/common/build/gamecode.c b/src/common/build/gamecode.c index d2f5ed94b..c2b051add 100644 --- a/src/common/build/gamecode.c +++ b/src/common/build/gamecode.c @@ -30,7 +30,7 @@ #include #include #include -#include +// #include #include #include #include @@ -75,10 +75,10 @@ #include #include -#include +// #include #include #include -#include +// #include #include #include diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index 618f7bb90..bf617b438 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -255,6 +255,8 @@ int cmp_current_owner(const struct building * b, const struct building * bother) int rule_auto_taxation(void); int rule_region_owners(void); int rule_stealth_faction(void); +#define HARVEST_WORK 0x00 +#define HARVEST_TAXES 0x01 int rule_blessed_harvest(void); extern int count_all(const struct faction * f); diff --git a/src/common/spells/regioncurse.h b/src/common/spells/regioncurse.h index d91f4847b..16d4a4adc 100644 --- a/src/common/spells/regioncurse.h +++ b/src/common/spells/regioncurse.h @@ -22,9 +22,6 @@ struct locale; extern void register_regioncurse(void); -#define HARVEST_WORK 0x00 -#define HARVEST_TAXES 0x01 - #ifdef __cplusplus } #endif