diff options
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon.txt | 3 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/test_spawner.png | bin | 0 -> 765 bytes | |||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 11 |
4 files changed, 15 insertions, 3 deletions
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 6998d41d73..5849dabc22 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -516,6 +516,9 @@ draco-job-scor DRACO_SCORCHER draco-job-shif DRACO_SHIFTER
draco-job-zea DRACO_ZEALOT
+%sdir dc-mon
+test_spawner MONS_TEST_SPAWNER
+
dc-misc/unseen PLAYER
dc-misc/unseen_monster MONS_UNKNOWN
dc-misc/unseen_monster MCACHE_START
diff --git a/crawl-ref/source/rltiles/dc-mon/test_spawner.png b/crawl-ref/source/rltiles/dc-mon/test_spawner.png Binary files differnew file mode 100644 index 0000000000..101c8857bc --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/test_spawner.png diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 21796d393f..615c8eb27f 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -673,6 +673,8 @@ static int _tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_TENTACLED_MONSTROSITY; case MONS_ORB_GUARDIAN: return TILEP_MONS_ORB_GUARDIAN; + case MONS_TEST_SPAWNER: + return TILEP_MONS_TEST_SPAWNER; // yaks and sheep ('Y') case MONS_SHEEP: @@ -2279,6 +2281,8 @@ static int _tileidx_shop(coord_def where) int tileidx_feature(int object, int gx, int gy) { + ASSERT(object < NUM_REAL_FEATURES); + switch (object) { case DNGN_UNSEEN: diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 72fa0016c2..cdfe9217b7 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -5088,13 +5088,18 @@ void viewwindow(bool draw_it, bool do_updates) int count_x, count_y; - if (map_bounds(you.pos())) + if (!crawl_state.arena) { - losight( env.show, grd, you.pos() ); // Must be done first. + // Must be done first. + losight(env.show, grd, you.pos()); // What would be visible, if all of the translucent walls were // made opaque. - losight( env.no_trans_show, grd, you.pos(), true ); + losight(env.no_trans_show, grd, you.pos(), true); + } + else + { + losight(env.show, grd, crawl_view.vgrdc); } #ifdef USE_TILE |
