Add miscellaneous minor fixes.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 90ae783279..c7aa24d5fb 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -125,7 +125,7 @@ void print_description( const std::string &d )
         if (nextLine >= currentPos && nextLine < currentPos + lineWidth)
         {
             cprintf("%s", (d.substr(currentPos, nextLine-currentPos)).c_str());
-            currentPos = nextLine +1;
+            currentPos = nextLine + 1;
             continue;
         }
 
@@ -150,8 +150,7 @@ void print_description( const std::string &d )
         // oops.  just truncate.
         nextLine = currentPos + lineWidth;
 
-        if (nextLine > d.length())
-            nextLine = d.length();
+        nextLine = std::min(d.length(), nextLine);
 
         cprintf((d.substr(currentPos, nextLine - currentPos)).c_str());
         currentPos = nextLine;