diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index 12480196d..27bcc1839 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -19,9 +19,6 @@ * permission from the authors. */ -#define RESERVE_DONATIONS 1 /* shall we reserve objects given to us by other factions? */ -#define RESERVE_GIVE 1 /* reserve anything that's given from one unit to another? */ - #include #include "eressea.h" #include "economy.h" diff --git a/src/common/kernel/give.c b/src/common/kernel/give.c index 45eddbd67..ac768c329 100644 --- a/src/common/kernel/give.c +++ b/src/common/kernel/give.c @@ -43,6 +43,9 @@ /* Wieviel Fremde eine Partei pro Woche aufnehmen kann */ #define MAXNEWBIES 5 +#define RESERVE_DONATIONS /* shall we reserve objects given to us by other factions? */ +#define RESERVE_GIVE /* reserve anything that's given from one unit to another? */ + static int GiveRestriction(void) { @@ -111,12 +114,14 @@ give_item(int want, const item_type * itype, unit * src, unit * dest, struct ord if (useitems, itype, n); -#if RESERVE_DONATIONS +#ifdef RESERVE_GIVE +#ifdef RESERVE_DONATIONS new_change_resvalue(dest, item2resource(itype), n); -#elif RESERVE_GIVE +#else if (src->faction==dest->faction) { new_change_resvalue(dest, item2resource(itype), n); } +#endif #endif handle_event(&src->attribs, "give", dest); handle_event(&dest->attribs, "receive", src);