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

make unit::race private

This commit is contained in:
Enno Rehling 2013-05-02 03:46:58 +02:00
parent cd4628421a
commit d817345e3f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kernel/unit.c
View File

@ -853,7 +853,7 @@ bool leave(unit * u, bool force)
const struct race *urace(const struct unit *u) const struct race *urace(const struct unit *u)
{ {
return u->race; return u->race_;
} }
bool can_survive(const unit * u, const region * r) 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]) { if (u->irace && skill_enabled[SK_STEALTH]) {
return u->irace; return u->irace;
} }
return u->race; return u->race_;
} }
const struct race *u_race(const struct unit *u) 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) void u_setrace(struct unit *u, const struct race *rc)
{ {
assert(rc); assert(rc);
u->race = rc; u->race_ = rc;
} }
void unit_add_spell(unit * u, sc_mage * m, struct spell * sp, int level) void unit_add_spell(unit * u, sc_mage * m, struct spell * sp, int level)

2
src/kernel/unit.h
View File

@ -102,7 +102,7 @@ extern "C" {
struct order *old_orders; struct order *old_orders;
/* race and illusionary race */ /* race and illusionary race */
const struct race *race; const struct race *race_;
const struct race *irace; const struct race *irace;
unsigned int flags; unsigned int flags;