diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index f6be521a1..bebaebdbe 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -813,12 +813,8 @@ give_cmd(unit * u, order * ord) } if (u2 && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) { - const resource_type * rtype = findresourcetype(s, u->faction->locale); - if (rtype==NULL || !fval(rtype, RTF_SNEAK)) - { - cmistake(u, ord, 40, MSG_COMMERCE); - return; - } + cmistake(u, ord, 40, MSG_COMMERCE); + return; } i = findparam(s, u->faction->locale); if (i == P_PERSON) { diff --git a/src/common/kernel/item.h b/src/common/kernel/item.h index e780d80b7..cc7f0e0f5 100644 --- a/src/common/kernel/item.h +++ b/src/common/kernel/item.h @@ -40,10 +40,9 @@ typedef struct resource { /* bitfield values for resource_type::flags */ #define RTF_NONE 0 #define RTF_ITEM (1<<0) /* this resource is an item */ -#define RTF_SNEAK (1<<1) /* can be sneaked to another struct unit, e.g. P_FOOL */ -#define RTF_LIMITED (1<<2) /* a resource that's freely available, but in +#define RTF_LIMITED (1<<1) /* a resource that's freely available, but in * limited supply */ -#define RTF_POOLED (1<<3) /* resource is available in pool */ +#define RTF_POOLED (1<<2) /* resource is available in pool */ /* flags for resource_type::name() */ #define NMF_PLURAL 0x01 diff --git a/src/res/resources.xml b/src/res/resources.xml index 2960b04e0..f40e458a4 100644 --- a/src/res/resources.xml +++ b/src/res/resources.xml @@ -748,7 +748,7 @@ - +