diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 21:46:56 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 21:46:56 +0000 |
| commit | c0c613a08e2c4353475b6dd14f5aa934b364a38d (patch) | |
| tree | 61bef1064546f3833b9361ada39307be5b199f3d /crawl-ref/source/directn.cc | |
| parent | 6dc97e95453230d0f5ea8d72feee98c561f078cc (diff) | |
| download | crawl-ref-c0c613a08e2c4353475b6dd14f5aa934b364a38d.tar.gz crawl-ref-c0c613a08e2c4353475b6dd14f5aa934b364a38d.zip | |
Fix a recent bug of mine that blocked the friendly fire prompts.
Fix 1943573: Weird message order when attacking charmed monsters.
Fix 1826896: NOTE_ID could have line breaks in mid-word
Modify the "This feature has more information" hint to mention
mouseclicking for Tiles players rather than 'v' like for purists.
Oh, and when trying to look into BR 1952908 (buggy trap in the Abyss)
I found that traps can be generated in the Abyss after all. I don't
know when that was changed but the last time I checked I remember
seeing something like "if (level == ABYSS) return false" in a
"Can there be traps here?" check. Is my memory playing tricks on me
or was that really changed, and if so, was it intentional?
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5445 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
| -rw-r--r-- | crawl-ref/source/directn.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 1cb11e4303..23ce7b0b1a 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2320,7 +2320,12 @@ static void describe_cell(int mx, int my) #endif if (Options.tutorial_left && tutorial_monster_interesting(&menv[i])) { - std::string msg = "(Press <w>v<lightgray> for more information.)"; + std::string msg; +#ifdef USE_TILE + msg = "(Right-click for more information.)"; +#else + msg = "(Press <w>v<lightgray> for more information.)"; +#endif print_formatted_paragraph(msg, get_number_of_cols()); } } @@ -2397,8 +2402,11 @@ static void describe_cell(int mx, int my) #else if (Options.tutorial_left && tutorial_pos_interesting(mx, my)) { +#ifdef USE_TILE + feature_desc += " (Right-click for more information.)"; +#else feature_desc += " (Press <w>v<lightgray> for more information.)"; - +#endif print_formatted_paragraph(feature_desc, get_number_of_cols()); } else @@ -2406,7 +2414,13 @@ static void describe_cell(int mx, int my) const dungeon_feature_type feat = grd[mx][my]; if (interesting_feature(feat)) + { +#ifdef USE_TILE + feature_desc += " (Right-click for more information.)"; +#else feature_desc += " (Press 'v' for more information.)"; +#endif + } // Suppress "Floor." if there's something on that square that we've // already described. |