From d817345e3fc591c21b0c24fda052d1c91a35c74b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 2 May 2013 03:46:58 +0200 Subject: [PATCH] make unit::race private --- src/kernel/unit.c | 8 ++++---- src/kernel/unit.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kernel/unit.c b/src/kernel/unit.c index 5f7f093f5..f1808f780 100644 --- a/src/kernel/unit.c +++ b/src/kernel/unit.c @@ -853,7 +853,7 @@ bool leave(unit * u, bool force) const struct race *urace(const struct unit *u) { - return u->race; + return u->race_; } bool can_survive(const unit * u, const region * r) @@ -1730,18 +1730,18 @@ const struct race *u_irace(const struct unit *u) if (u->irace && skill_enabled[SK_STEALTH]) { return u->irace; } - return u->race; + return u->race_; } const struct race *u_race(const struct unit *u) { - return u->race; + return u->race_; } void u_setrace(struct unit *u, const struct race *rc) { assert(rc); - u->race = rc; + u->race_ = rc; } void unit_add_spell(unit * u, sc_mage * m, struct spell * sp, int level) diff --git a/src/kernel/unit.h b/src/kernel/unit.h index ea290f8b1..ebaab56f5 100644 --- a/src/kernel/unit.h +++ b/src/kernel/unit.h @@ -102,7 +102,7 @@ extern "C" { struct order *old_orders; /* race and illusionary race */ - const struct race *race; + const struct race *race_; const struct race *irace; unsigned int flags;