diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-04 10:04:17 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-04 16:50:18 +0100 |
| commit | 6f10cd2574eeb8a1417eff84718edd309287ac0d (patch) | |
| tree | 69a45fe0e35cb559a3285b08697c96c230fc0c0f /crawl-ref/source/mon-behv.cc | |
| parent | 9ad85435681ad82c7ef07d2083e40e525e2b0f55 (diff) | |
| download | crawl-ref-6f10cd2574eeb8a1417eff84718edd309287ac0d.tar.gz crawl-ref-6f10cd2574eeb8a1417eff84718edd309287ac0d.zip | |
Get rid of multiple-meaning "int object" in env.show.
env.show is now a class show_def that stores tagged
unions of type show_type. For the moment, there's also
env.show_los for use in LOS determination, but that
should become an array of boolean at some point.
This breaks save compatibility.
Tiles and console version build and appear to work
fine, but this kind of change is likely to have
some side-effects.
Diffstat (limited to 'crawl-ref/source/mon-behv.cc')
| -rw-r--r-- | crawl-ref/source/mon-behv.cc | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index f7be683b9b..4335854400 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -40,21 +40,18 @@ static void _check_lava_water_in_sight() // XXX: remove explicit coordinate translation. const coord_def ep = *ri - you.pos() + coord_def(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET); - if (env.show(ep)) + const dungeon_feature_type feat = grd(*ri); + if (feat == DNGN_LAVA) { - const dungeon_feature_type feat = grd(*ri); - if (feat == DNGN_LAVA) - { - you.lava_in_sight = 1; - if (you.water_in_sight > 0) - break; - } - else if (feat == DNGN_DEEP_WATER) - { - you.water_in_sight = 1; - if (you.lava_in_sight > 0) - break; - } + you.lava_in_sight = 1; + if (you.water_in_sight > 0) + break; + } + else if (feat == DNGN_DEEP_WATER) + { + you.water_in_sight = 1; + if (you.lava_in_sight > 0) + break; } } } |