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

remove at_guard from guard.c, fix compilation.

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

15
src/guard.c
View File

@ -30,21 +30,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <kernel/race.h> #include <kernel/race.h>
#include <kernel/region.h> #include <kernel/region.h>
#include <kernel/building.h> #include <kernel/building.h>
#include <util/attrib.h>
#include <assert.h> #include <assert.h>
attrib_type at_guard = {
"guard",
DEFAULT_INIT,
DEFAULT_FINALIZE,
DEFAULT_AGE,
NULL,
a_readint,
NULL,
ATF_UNIQUE
};
guard_t can_start_guarding(const unit * u) guard_t can_start_guarding(const unit * u)
{ {
if (u->status >= ST_FLEE || fval(u, UFL_FLEEING)) if (u->status >= ST_FLEE || fval(u, UFL_FLEEING))
@ -80,7 +68,6 @@ unsigned int guard_flags(const unit * u)
// TODO: this should be a property of the race, like race.guard_flags // TODO: this should be a property of the race, like race.guard_flags
static int rc_cache; static int rc_cache;
static const race *rc_elf, *rc_ent, *rc_ironkeeper; static const race *rc_elf, *rc_ent, *rc_ironkeeper;
const race *rc = u_race(u);
unsigned int flags = unsigned int flags =
GUARD_CREWS | GUARD_LANDING | GUARD_TRAVELTHRU | GUARD_TAX; GUARD_CREWS | GUARD_LANDING | GUARD_TRAVELTHRU | GUARD_TAX;
// TODO: configuration, not define // TODO: configuration, not define
@ -108,8 +95,6 @@ void setguard(unit * u, unsigned int flags)
unsigned int getguard(const unit * u) unsigned int getguard(const unit * u)
{ {
attrib *a;
assert(fval(u, UFL_GUARD) || (u->building && u == building_owner(u->building)) assert(fval(u, UFL_GUARD) || (u->building && u == building_owner(u->building))
|| !"you're doing it wrong! check is_guard first"); || !"you're doing it wrong! check is_guard first");
return guard_flags(u); return guard_flags(u);