diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index 6e9c773c1..4a5759d8a 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -524,7 +524,6 @@ give_item(int want, const item_type * itype, unit * src, unit * dest, const char assert(itype!=NULL); n = new_get_pooled(src, item2resource(itype), GET_DEFAULT); n = min(want, n); -#define GIVERESTRICTION 3 if (dest && src->faction != dest->faction && src->faction->age < GIVERESTRICTION) { ADDMSG(&src->faction->msgs, msg_error(src, cmd, "giverestriction", "turns", GIVERESTRICTION)); diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index e8cd1b276..2d41e32e7 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -39,6 +39,7 @@ #define RESOURCE_CONVERSION 1 #define RESOURCE_QUANTITY 0.5 #define TEACHDIFFERENCE 2 +#define GIVERESTRICTION 3 #define MUSEUM_MODULE #define ARENA_MODULE diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h index cc00434f8..42fb36698 100644 --- a/src/common/settings-tutorial.h +++ b/src/common/settings-tutorial.h @@ -40,5 +40,6 @@ #define RESOURCE_QUANTITY 0.5 #define TEACHDIFFERENCE 2 #define MAXAGE 8 +#define GIVERESTRICTION 3 #define MAILITPATH "/usr/sbin:$HOME/tutorial/bin:/bin:/usr/bin:/usr/local/bin" diff --git a/src/common/settings-vinyambar-3.h b/src/common/settings-vinyambar-3.h index 0d1304fbf..68afe9d62 100644 --- a/src/common/settings-vinyambar-3.h +++ b/src/common/settings-vinyambar-3.h @@ -39,6 +39,7 @@ #define RESOURCE_CONVERSION 1 #define RESOURCE_QUANTITY 0.5 #define TEACHDIFFERENCE 2 +#define GIVERESTRICTION 0 #define ALLIANCES #undef ALLIANCEJOIN