diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-01 14:03:23 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-01 14:03:23 +0000 |
| commit | e5fc908cc50565402f1ea1acc037e5b8791870c1 (patch) | |
| tree | 37f4d7e47addb7e81d0e375bb030456e189fb5c8 /crawl-ref/source/directn.cc | |
| parent | 6384f9c708cf79f471df00d1e0cfa3f2c1bf4172 (diff) | |
| download | crawl-ref-e5fc908cc50565402f1ea1acc037e5b8791870c1.tar.gz crawl-ref-e5fc908cc50565402f1ea1acc037e5b8791870c1.zip | |
Fix .des timer messaging to be easier to customise, applied timer to sewer portals.
Fix typo in monspeak.txt (slinkies).
Fixed hippogriff plural.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7709 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
| -rw-r--r-- | crawl-ref/source/directn.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 276b60266c..ba3f2df750 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2271,12 +2271,12 @@ void describe_floor() mpr("Beware, for starvation awaits!", MSGCH_EXAMINE); } -static std::string _feature_do_grammar(description_level_type dtype, - bool add_stop, - bool force_article, - std::string desc) +std::string thing_do_grammar(description_level_type dtype, + bool add_stop, + bool force_article, + std::string desc) { - if (add_stop) + if (add_stop && (desc.empty() || desc[desc.length() - 1] != '.')) desc += "."; if (dtype == DESC_PLAIN || (!force_article && isupper(desc[0]))) { @@ -2320,7 +2320,7 @@ std::string feature_description(dungeon_feature_type grid, if (bloody) desc += ", spattered with blood"; - return _feature_do_grammar(dtype, add_stop, grid_is_trap(grid), desc); + return thing_do_grammar(dtype, add_stop, grid_is_trap(grid), desc); } std::string raw_feature_description(dungeon_feature_type grid, @@ -2592,7 +2592,7 @@ std::string feature_description(const coord_def& where, bool bloody, if (bloody) desc += ", spattered with blood"; - return _feature_do_grammar(dtype, add_stop, false, desc); + return thing_do_grammar(dtype, add_stop, false, desc); } switch (grid) @@ -2606,7 +2606,7 @@ std::string feature_description(const coord_def& where, bool bloody, return (shop_name(where, add_stop)); case DNGN_ENTER_PORTAL_VAULT: - return (_feature_do_grammar( + return (thing_do_grammar( dtype, add_stop, false, _marker_feature_description(where))); default: |