diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-26 16:39:05 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-26 16:43:04 +0100 |
| commit | 815149f22ce217701fdca252be21a00ba1c4706f (patch) | |
| tree | 5e7273c7681a40df73487e2c30d9975785051f22 /crawl-ref | |
| parent | 4cead2d3ab94322f080e143e9786b76f953ac85e (diff) | |
| download | crawl-ref-815149f22ce217701fdca252be21a00ba1c4706f.tar.gz crawl-ref-815149f22ce217701fdca252be21a00ba1c4706f.zip | |
Member renaming in travel_exclude.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/travel.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/travel.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 704f9437e0..5349e631be 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -305,10 +305,10 @@ static opacity_excl opc_excl; // currently short-cut for small bounds. So radius 0 is special-cased. travel_exclude::travel_exclude(const coord_def &p, int r, - bool autoex, int mons, bool vault) + bool autoexcl, int mons, bool vaultexcl) : pos(p), radius(r), los(los_def(p, opc_excl, bounds_radius(r))), - uptodate(false), autoexclude(autoex), vaultexclude(vault) + uptodate(false), autoex(autoex), vault(vaultexcl) { set_los(); } @@ -551,7 +551,7 @@ void maybe_remove_autoexclusion(const coord_def &p) if (travel_exclude *exc = _find_exclude_root(p)) { const monsters *m = monster_at(p); - if (exc->autoexclude && (!m || !you.can_see(m) || m->type != exc->mon)) + if (exc->autoex && (!m || !you.can_see(m) || m->type != exc->mon)) del_exclude(p); } } @@ -3614,7 +3614,7 @@ void LevelInfo::save(writer& outf) const { marshallCoord(outf, excludes[i].pos); marshallShort(outf, excludes[i].radius); - marshallBoolean(outf, excludes[i].autoexclude); + marshallBoolean(outf, excludes[i].autoex); marshallShort(outf, excludes[i].mon); } } diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h index 5a4fa07135..7cf296869d 100644 --- a/crawl-ref/source/travel.h +++ b/crawl-ref/source/travel.h @@ -359,13 +359,13 @@ struct travel_exclude int radius; // exclusion radius los_def los; // los from exclusion centre bool uptodate; // Is los up to date? - bool autoexclude; // Was set automatically. + bool autoex; // Was set automatically. int mon; // Monster around which exclusion is centered. - bool vaultexclude; // Is this exclusion set by a vault? + bool vault; // Is this exclusion set by a vault? travel_exclude(const coord_def &p, int r = LOS_RADIUS, - bool autoexcl = false, int mons = NON_MONSTER, - bool vaultexcl = false); + bool autoex = false, int mons = NON_MONSTER, + bool vault = false); int radius_sq() const; void set_los(); |