summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-04 13:29:55 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-04 13:29:55 +0000
commit703d0aea0efaac377a2270d1341b1cf533c9bd74 (patch)
tree83507f38781de8ca552625124603e99bce673296
parentbeb2b85fcf0ceec4d61a0b0878fc074c86d185ab (diff)
downloadcrawl-ref-703d0aea0efaac377a2270d1341b1cf533c9bd74.tar.gz
crawl-ref-703d0aea0efaac377a2270d1341b1cf533c9bd74.zip
Fixed Erik's labyrinth trails.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.1.5@557 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/files.cc5
-rw-r--r--crawl-ref/source/view.cc11
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index f9c3332186..fc86cc2cc1 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -969,10 +969,7 @@ found_stair:
// This should fix the "monster occuring under the player" bug?
if (mgrd[you.x_pos][you.y_pos] != NON_MONSTER)
monster_teleport(&menv[mgrd[you.x_pos][you.y_pos]], true);
- /*
- if (you.level_type == LEVEL_LABYRINTH || you.level_type == LEVEL_ABYSS)
- grd[you.x_pos][you.y_pos] = DNGN_FLOOR;
- */
+
int following = 0;
// actually "move" the followers if applicable
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index d222a7484e..136f8c1f5f 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -3486,10 +3486,13 @@ void viewwindow(bool draw_it, bool do_updates)
unsigned short ch;
get_symbol( object, &ch, &colour );
- set_envmap_glyph( gx, gy, ch, colour, object );
- set_terrain_seen( gx, gy );
- set_envmap_detected_mons(gx, gy, false);
- set_envmap_detected_item(gx, gy, false);
+ if (map)
+ {
+ set_envmap_glyph( gx, gy, ch, colour, object );
+ set_terrain_seen( gx, gy );
+ set_envmap_detected_mons(gx, gy, false);
+ set_envmap_detected_item(gx, gy, false);
+ }
// player overrides everything in cell
buffy[bufcount] = you.symbol;