diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-24 22:49:03 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-24 22:49:03 +0000 |
| commit | af13176b28721a63037bc82e75778121f34a8ae1 (patch) | |
| tree | 7a6616f15ccc925d0a1dedb84e44dfe8a8ede852 /crawl-ref/source/view.cc | |
| parent | 699744855c0118c363391967d15f4667bf1c622d (diff) | |
| download | crawl-ref-af13176b28721a63037bc82e75778121f34a8ae1.tar.gz crawl-ref-af13176b28721a63037bc82e75778121f34a8ae1.zip | |
* Another patch by zebez: Display fountain tiles for magic mapping.
* Fix 2826781: Black background for Detect Items/Creatures tiles after
magic mapping.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10393 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/view.cc')
| -rw-r--r-- | crawl-ref/source/view.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 93d6111ec6..69be6e93d3 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -255,6 +255,11 @@ bool is_terrain_changed( int x, int y ) return (env.map[x][y].flags & MAP_CHANGED_FLAG); } +bool is_terrain_mapped(const coord_def &p) +{ + return (env.map(p).flags & MAP_MAGIC_MAPPED_FLAG); +} + // Used to mark dug out areas, unset when terrain is seen or mapped again. void set_terrain_changed( int x, int y ) { @@ -821,7 +826,7 @@ void clear_map(bool clear_detected_items, bool clear_detected_monsters) if (!clear_detected_monsters && is_envmap_detected_mons(p)) continue; - if (env.map(p).flags & MAP_MAGIC_MAPPED_FLAG) + if (is_terrain_mapped(p)) continue; set_envmap_obj(p, is_terrain_known(p)? grd(p) : DNGN_UNSEEN); @@ -3904,8 +3909,7 @@ bool magic_mapping(int map_radius, int proportion, bool suppress_msg, clear_envmap_grid(*ri); #ifdef USE_TILE - if (!wizard_map && is_terrain_known(*ri) - && !(env.map(*ri).flags & MAP_MAGIC_MAPPED_FLAG)) + if (!wizard_map && is_terrain_known(*ri) && !is_terrain_mapped(*ri)) { // Can't use set_envmap_obj because that would // overwrite the gmap. |