Changed door-open failure message to match the door-close message.

Added special case messages for doors already open or closed.
Maybe there should be flavor messages for # gateways?  We use the
same noun (gate/gateway) for # and +++.

Remove leading underscore from find_connected_identical() now that it's public.

Change large door descriptions slightly:
  - "open/closed large door" -> "large open/closed door"
  - "There's a creature in the large doorway!" -> "... in the doorway"
  - Other messages read a bit better without the adjective, but if it's removed
    then almost all the flavor is gone.  So I left them alone.



git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3664 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 4 deletions

diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc
index 73c204f1b6..76b6fc40dd 100644
--- a/crawl-ref/source/direct.cc
+++ b/crawl-ref/source/direct.cc
@@ -1815,11 +1815,14 @@ std::string feature_description(int mx, int my, bool bloody,
 
     if ( grid == DNGN_OPEN_DOOR || grid == DNGN_CLOSED_DOOR )
     {
-        std::string desc = (grid == DNGN_OPEN_DOOR) ? "open " : "closed ";
-
         std::set<coord_def> all_door;
-        _find_connected_identical(coord_def(mx, my), grd[mx][my], all_door);
-        desc += get_door_noun(all_door.size()).c_str();
+        find_connected_identical(coord_def(mx, my), grd[mx][my], all_door);
+        const char *adj, *noun;
+        get_door_description(all_door.size(), &adj, &noun);
+
+        std::string desc = adj;
+        desc += (grid == DNGN_OPEN_DOOR) ? "open " : "closed ";
+        desc += noun;
 
         if (bloody)
             desc += ", spattered with blood";