diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-08 14:23:03 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-08 14:46:22 +0100 |
| commit | 28f6c800df6bc63658b9c79e803bf81ac282aa1d (patch) | |
| tree | df593b87768f0324939f89ed6f4d7aea8c950de4 /crawl-ref/source/mon-behv.cc | |
| parent | a4eda3c37bb9ec6d9b847e827390a66062229b99 (diff) | |
| download | crawl-ref-28f6c800df6bc63658b9c79e803bf81ac282aa1d.tar.gz crawl-ref-28f6c800df6bc63658b9c79e803bf81ac282aa1d.zip | |
Split map knowledge and FPROPs.
map_cell no longer has the field "properties", which has been
replaced by the unsigned long array env.pgrid.
env.map has been renamed to env.map_knowledge. It should really
be moved into player.
Diffstat (limited to 'crawl-ref/source/mon-behv.cc')
| -rw-r--r-- | crawl-ref/source/mon-behv.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index f9c97804fb..270e006d9a 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -12,7 +12,8 @@ #include "coord.h" #include "coordit.h" -#include "envmap.h" +#include "map_knowledge.h" +#include "fprop.h" #include "exclude.h" #include "los.h" #include "monplace.h" @@ -429,7 +430,7 @@ static bool _find_siren_water_target(monsters *mon) #ifdef WIZARD // Remove old highlighted areas to make place for the new ones. for (rectangle_iterator ri(1); ri; ++ri) - env.map(*ri).property &= ~(FPROP_HIGHLIGHT); + env.pgrid(*ri) &= ~(FPROP_HIGHLIGHT); #endif if (mp.init_pathfind(mon, best_target)) @@ -440,7 +441,7 @@ static bool _find_siren_water_target(monsters *mon) { #ifdef WIZARD for (unsigned int i = 0; i < mon->travel_path.size(); i++) - env.map(mon->travel_path[i]).property |= FPROP_HIGHLIGHT; + env.pgrid(mon->travel_path[i]) |= FPROP_HIGHLIGHT; #endif #ifdef DEBUG_PATHFIND mprf("Found a path to (%d, %d) with %d surrounding water squares", @@ -521,7 +522,7 @@ static bool _find_wall_target(monsters *mon) #ifdef WIZARD // Remove old highlighted areas to make place for the new ones. for (rectangle_iterator ri(1); ri; ++ri) - env.map(*ri).property &= ~(FPROP_HIGHLIGHT); + env.pgrid(*ri) &= ~(FPROP_HIGHLIGHT); #endif if (mp.init_pathfind(mon, best_target)) @@ -532,7 +533,7 @@ static bool _find_wall_target(monsters *mon) { #ifdef WIZARD for (unsigned int i = 0; i < mon->travel_path.size(); i++) - env.map(mon->travel_path[i]).property |= FPROP_HIGHLIGHT; + env.pgrid(mon->travel_path[i]) |= FPROP_HIGHLIGHT; #endif #ifdef DEBUG_PATHFIND mprf("Found a path to (%d, %d)", best_target.x, best_target.y); |