summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/travel.h
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-10-25 16:33:16 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-10-25 16:33:41 +0100
commit5e1b1aeec721082e65edba8538c7293f922fa030 (patch)
tree0808140f27a1417a51a16a493f352bb863cd1ad2 /crawl-ref/source/travel.h
parent21060a38ec5f533d3cfc5614418c7ff8fecfabb1 (diff)
downloadcrawl-ref-5e1b1aeec721082e65edba8538c7293f922fa030.tar.gz
crawl-ref-5e1b1aeec721082e65edba8538c7293f922fa030.zip
Revert "Convert exclusions to los_def."
This reverts commit 7afa089db8b01b1810c5903309f7302545638550. los_def is currently buggy, leading to weird behaviour when deleting exclusions.
Diffstat (limited to 'crawl-ref/source/travel.h')
-rw-r--r--crawl-ref/source/travel.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index e23c5a3c05..78b21b23b6 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -7,9 +7,6 @@
#define TRAVEL_H
#include "externs.h"
-
-#include "los.h"
-
#include <stdio.h>
#include <string>
#include <vector>
@@ -355,16 +352,16 @@ void update_exclusion_los(std::vector<coord_def> changed);
struct travel_exclude
{
- coord_def pos; // exclusion centre
- int radius; // exclusion radius
- bool autoexclude; // Was set automatically.
- int mon; // Monster around which exclusion is centered.
- los_def los; // los from exclusion centre
- bool uptodate; // Is los up to date?
+ coord_def pos; // exclusion centre
+ int radius; // exclusion radius
+ bool autoexclude; // Was set automatically.
+ int mon; // Monster around which exclusion is centered.
+ env_show_grid show; // los from exclusion centre
+ bool uptodate; // Is show up to date?
bool vaultexclude; // Is this exclusion set by a vault?
int radius_sq() const;
- void set_los();
+ void set_exclude_show();
bool affects(const coord_def& p) const;
travel_exclude(const coord_def &p, int r = LOS_RADIUS,
@@ -372,7 +369,7 @@ struct travel_exclude
bool vaultexcl = false)
: pos(p), radius(r), autoexclude(autoexcl), mon(mons), vaultexclude(vaultexcl)
{
- set_los();
+ set_exclude_show();
}
};