diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 16:52:40 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 16:52:40 +0000 |
| commit | 0a4efdf86b33220269f7439aeb5952a88d50efa7 (patch) | |
| tree | fb0826c6072cd6f598ed9e905dea8faa4fd30601 /crawl-ref/source/acr.cc | |
| parent | b50eafe8de72cbcc4431813934695c22642cdd46 (diff) | |
| download | crawl-ref-0a4efdf86b33220269f7439aeb5952a88d50efa7.tar.gz crawl-ref-0a4efdf86b33220269f7439aeb5952a88d50efa7.zip | |
Fix a stupid bug I'd introduced when fixing another one.
Fix 1939901: Weapon listing not updated right away after being cursed.
Put the code to colour arbitrary substrings of a message according to
the menu_colour settings into a function of its own, and use it for
pick up and eating prompts (currently from floor only) as well as for
the "Things that are here" listing. Could be overly spammy, thus needs
testing. If all works well, we can remove the "msg =" settings in
food_colouring.txt that currently don't do anything anyway, or reuse
them for non-prompt messages like "You see here a green rat corpse."
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5436 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 327a50d4f9..612f125951 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1363,7 +1363,9 @@ static void _input() Options.tut_just_triggered = false; - if ( i_feel_safe() ) + // He, we don't want those "Whew, it's safe to rest now" messages when + // you were just cast into the abyss. Right? + if (i_feel_safe() && you.level_type != LEVEL_ABYSS) { if (Options.tutorial_left) { @@ -2199,7 +2201,7 @@ void process_command( command_type cmd ) { coord_def pos; #ifdef USE_TILE - // Since they're no actual overview map, but the functionality + // Since there's no actual overview map, but the functionality // exists, give a message to explain what's going on. std::string str = "Move the cursor to view the level map, or " "type <w>?</w> for a list of commands."; |