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

fix Linux compilation.

This commit is contained in:
Enno Rehling 2016-10-30 09:47:18 +01:00
parent f147d6a8c8
commit eb7199450d
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/economy.c
View File

@ -872,19 +872,6 @@ typedef struct allocation_list {
static allocation_list *allocations;
static bool can_guard(const unit * guard, const unit * u)
{
if (fval(guard, UFL_ISNEW))
return false;
if (guard->number <= 0 || !cansee(guard->faction, guard->region, u, 0))
return false;
if (besieged(guard) || !(fval(u_race(guard), RCF_UNARMEDGUARD)
|| armedmen(guard, true)))
return false;
return !alliedunit(guard, u->faction, HELP_GUARD);
}
enum {
AFL_DONE = 1 << 0,
AFL_LOWSKILL = 1 << 1

2
src/guard.c
View File

@ -66,8 +66,6 @@ void update_guards(void)
unsigned int guard_flags(const unit * u)
{
// TODO: this should be a property of the race, like race.guard_flags
static int rc_cache;
static const race *rc_elf, *rc_ent, *rc_ironkeeper;
unsigned int flags =
GUARD_CREWS | GUARD_LANDING | GUARD_TRAVELTHRU | GUARD_TAX;
// TODO: configuration, not define