diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-04 10:06:01 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-04 10:06:01 +0000 |
| commit | 55d2a46739afd9fca9bf8f49edbe2237ce53e690 (patch) | |
| tree | 873f91b8ddc784fdf84486123933313728c9eddf /crawl-ref | |
| parent | 2c769fc53c28c3db16d89757564efaf70ca116ab (diff) | |
| download | crawl-ref-55d2a46739afd9fca9bf8f49edbe2237ce53e690.tar.gz crawl-ref-55d2a46739afd9fca9bf8f49edbe2237ce53e690.zip | |
Fixed Erik's labyrinth trails.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@553 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/files.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index a042cbdf48..119068ecd0 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -966,10 +966,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 87fedccb2c..c968e1901d 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -3369,10 +3369,13 @@ void viewwindow(bool draw_it, bool do_updates) unsigned short ch; get_symbol( gx, gy, 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; |