--- deliantra/server/common/player.C	2009/06/26 16:21:57	1.51
+++ deliantra/server/common/player.C	2009/09/17 00:10:03	1.54
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -339,6 +339,9 @@
 
         case '\r':
           buf << '\n';
+          /* \r\n+ becomes one or more newlines */
+          while (*cfpod == '\n')
+            buf << *cfpod++;
           break;
 
         case '\n':
@@ -408,17 +411,17 @@
                         nest.clear ();
 
                         if (pl->hintmode == 1)
-                          buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>";
+                          buf << "<fg name=\"lightblue\">[Hint available]</fg>";
                         else
-                          while (*cfpod == ' ') // eat trailing whitespace
+                          while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
                             ++cfpod;
 
                         goto skip;
                       }
                     else
                       {
-                        pfx = "<fg name=\"lightblue\">[";
-                        sfx = " (Use hintmode to suppress hints)]</fg>";
+                        pfx = "<fg name=\"lightblue\">[Hint: ";
+                        sfx = "]</fg>";
                       }
                   }
                   break;