diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-23 20:23:20 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-23 20:23:20 +0000 |
| commit | 1a8d4c881449acb7024d558d731d297318162f47 (patch) | |
| tree | 6014b186d8ba9d17e3dac55a8b3e1137434e4b9c | |
| parent | fd8bd1ca5468a36c6ec217327d227c5307ba1356 (diff) | |
| download | crawl-ref-1a8d4c881449acb7024d558d731d297318162f47.tar.gz crawl-ref-1a8d4c881449acb7024d558d731d297318162f47.zip | |
* Change spell range display to something like @----->..
This should be a bit clearer and is closer to the power display that
also uses dots for potential not yet reached.
* Fix 2824220: Magic mapping revealing real terrain tiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10388 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/macro.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index d2d006afee..44f4c8b7a3 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -633,7 +633,7 @@ static keyseq _getch_mul( int (*rgetch)() = NULL ) // get new keys from the user. if (crawl_state.is_replaying_keys()) { - mpr(MSGCH_ERROR, "(Key replay ran out of keys)"); + mpr("(Key replay ran out of keys)", MSGCH_ERROR); crawl_state.cancel_cmd_repeat(); crawl_state.cancel_cmd_again(); } diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index a7cff3e036..a71cee4c16 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -2363,8 +2363,7 @@ std::string spell_range_string(spell_type spell) return "N/A"; else { - return std::string("@") + std::string(range, '.') - + "<darkgrey>" + std::string(maxrange - range, '.') - + "</darkgrey>"; + return std::string("@") + std::string(range - 1, '-') + + std::string(">") + std::string(maxrange - range, '.'); } } diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 8c290ab2b4..e1c3d34efb 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2649,7 +2649,7 @@ void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch, case '[': case ']': fg = TILE_UNSEEN_ARMOUR; break; case '\\': fg = TILE_STAFF_OFFSET; break; - case '^': bg = TILE_DNGN_TRAP_ZOT; break; + case '^': bg = TILE_DNGN_TRAP_ARROW; break; case '_': case 220: case 131: fg = TILE_UNSEEN_ALTAR; break; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 904cbe3539..6f5d464ef4 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -3901,7 +3901,8 @@ 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)) + if (!wizard_map && is_terrain_known(*ri) + && !(env.map(*ri).flags & MAP_MAGIC_MAPPED_FLAG)) { // Can't use set_envmap_obj because that would // overwrite the gmap. |