Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

http://eressea.upb.de/mantis/view.php?id=1360 

"Dumpfbackenbrot funktioniert nicht?"
- removed old RTF_SNEAK flag (no longer required)
This commit is contained in:
Enno Rehling 2008-02-04 18:48:20 +00:00
parent 16d55c2eaf
commit ea71efe3f2
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/economy.c
View File

@ -813,13 +813,9 @@ give_cmd(unit * u, order * ord)
} }
if (u2 && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) { 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); cmistake(u, ord, 40, MSG_COMMERCE);
return; return;
} }
}
i = findparam(s, u->faction->locale); i = findparam(s, u->faction->locale);
if (i == P_PERSON) { if (i == P_PERSON) {
if (!(u->race->ec_flags & GIVEPERSON)) { if (!(u->race->ec_flags & GIVEPERSON)) {

5
src/common/kernel/item.h
View File

@ -40,10 +40,9 @@ typedef struct resource {
/* bitfield values for resource_type::flags */ /* bitfield values for resource_type::flags */
#define RTF_NONE 0 #define RTF_NONE 0
#define RTF_ITEM (1<<0) /* this resource is an item */ #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<<1) /* a resource that's freely available, but in
#define RTF_LIMITED (1<<2) /* a resource that's freely available, but in
* limited supply */ * 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() */ /* flags for resource_type::name() */
#define NMF_PLURAL 0x01 #define NMF_PLURAL 0x01

2
src/res/resources.xml
View File

@ -748,7 +748,7 @@
</item> </item>
</resource> </resource>
<resource name="p7" appearance="vial" sneak="yes"> <resource name="p7" appearance="vial">
<item weight="0" score="90"> <item weight="0" score="90">
<function name="useonother" value="usefoolpotion"/> <function name="useonother" value="usefoolpotion"/>
<potion level="3"/> <potion level="3"/>