summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acr.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-02 12:31:12 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-02 12:31:12 +0000
commitb50eafe8de72cbcc4431813934695c22642cdd46 (patch)
tree393c748e0cffac935a3ca89114e3444a2795ca7f /crawl-ref/source/acr.cc
parentc78ed8ca5a6f1528db2bfe1f846e24bef6695a89 (diff)
downloadcrawl-ref-b50eafe8de72cbcc4431813934695c22642cdd46.tar.gz
crawl-ref-b50eafe8de72cbcc4431813934695c22642cdd46.zip
I'm not sure I actually coded anything worthwhile, though I experimented
a fair bit and as usually ended up doing lots of clean-up. Oh wait, I modified eat_from_floor prompts to only force a more if there was actually a message before trying the inventory (whoops), and also modified the corpses in pack hint to take into account that a saccing player won't be interested in butchering rotten corpses. Also implemented a modified FR 1981119: when Detect Creatures only detects plants already seen before, print a different message ("You detect no further creatures."). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5435 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r--crawl-ref/source/acr.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index a873ddc5c9..327a50d4f9 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1930,8 +1930,7 @@ void process_command( command_type cmd )
break;
case CMD_CLEAR_MAP:
- if (you.level_type != LEVEL_LABYRINTH
- && you.level_type != LEVEL_ABYSS)
+ if (player_in_mappable_area())
{
mpr("Clearing level map.");
clear_map();
@@ -1939,11 +1938,11 @@ void process_command( command_type cmd )
}
break;
- case CMD_GO_UPSTAIRS: _go_upstairs(); break;
- case CMD_GO_DOWNSTAIRS: _go_downstairs(); break;
case CMD_DISPLAY_OVERMAP: display_overmap(); break;
- case CMD_OPEN_DOOR: _open_door(0, 0); break;
- case CMD_CLOSE_DOOR: _close_door(0, 0); break;
+ case CMD_GO_UPSTAIRS: _go_upstairs(); break;
+ case CMD_GO_DOWNSTAIRS: _go_downstairs(); break;
+ case CMD_OPEN_DOOR: _open_door(0, 0); break;
+ case CMD_CLOSE_DOOR: _close_door(0, 0); break;
case CMD_DROP:
drop();
@@ -2200,6 +2199,8 @@ void process_command( command_type cmd )
{
coord_def pos;
#ifdef USE_TILE
+ // Since they're 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.";
print_formatted_paragraph(str, get_number_of_cols());