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

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2019-08-24 22:02:15 +02:00
parent 5cb3517142 f8e2657b62
commit ae7a6cb5c1
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kernel/config.c
View File

@ -534,6 +534,7 @@ int rule_give(void)
static int config;
static int rule;
if (config_changed(&config)) {
/* TODO: No game uses this. Eliminate? */
rule = config_get_int("rules.give.flags", GIVE_DEFAULT);
}
return rule;

10
src/kernel/unit.c
View File

@ -239,19 +239,9 @@ int gift_items(unit * u, int flags)
region *r = u->region;
item **itm_p = &u->items;
int retval = 0;
int rule = rule_give();
assert(u->region);
if ((rule & GIVE_ONDEATH) == 0 || !u->faction || (u->faction->flags & FFL_QUIT) == 0) {
if ((rule & GIVE_ALLITEMS) == 0 && (flags & GIFT_FRIENDS))
flags -= GIFT_FRIENDS;
if ((rule & GIVE_PEASANTS) == 0 && (flags & GIFT_PEASANTS))
flags -= GIFT_PEASANTS;
if ((rule & GIVE_SELF) == 0 && (flags & GIFT_SELF))
flags -= GIFT_SELF;
}
if (u->items == NULL || fval(u_race(u), RCF_ILLUSIONARY))
return 0;