--- deliantra/server/common/player.C	2008/09/08 18:34:35	1.43
+++ deliantra/server/common/player.C	2009/11/05 15:43:21	1.57
@@ -1,28 +1,31 @@
 /*
  * 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
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #include <global.h>
 
+//+GPL
+
 /* Determine if the attacktype represented by the
  * specified attack-number is enabled for dragon players.
  * A dragon player (quetzal) can gain resistances for
@@ -48,8 +51,7 @@
   if (op
       && op->type == PLAYER
       && op->arch
-      && op->arch->race
-      && !strcmp (op->arch->race, "dragon"))
+      && op->arch->race == shstr_dragon)
     return 1;
 
   return 0;
@@ -66,7 +68,7 @@
   int wiz = ob->flag [FLAG_WIZ];
 
   /* Eneq(@csd.uu.se): If we have an open container hide it. */
-  object *container = ob->container;
+  object *container = ob->container_ ();
   ob->container = 0;
 
   if (ob->map)
@@ -135,6 +137,8 @@
   return true;
 }
 
+//-GPL
+
 bool
 player::save_pl (const char *path)
 {
@@ -294,7 +298,7 @@
 // end == 0, till eos
 // end >= 1, levels of " >>>"
 static const char *
-expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end)
+expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0)
 {
   static dynbuf_text nest(128, 128);
 
@@ -305,6 +309,13 @@
           return cfpod - 1;
 
         case ' ':
+          // verbatim block?
+          if (!buf.size () && !end)
+            {
+              --cfpod;
+              goto verbatim;
+            }
+
           if (end < 1)
             goto passthrough;
 
@@ -333,6 +344,9 @@
 
         case '\r':
           buf << '\n';
+          /* \r\n+ becomes one or more newlines */
+          while (*cfpod == '\n')
+            buf << *cfpod++;
           break;
 
         case '\n':
@@ -351,24 +365,14 @@
                 buf << *cfpod++;
               while (*cfpod == '\n');
             }
-          else if (*cfpod != ' ')
+          else if (*cfpod == ' ')
+            buf << '\n';
+          else
             buf << ' ';
 
-          // start verbatim block's?
+          // verbatim block?
           if (*cfpod == ' ')
-            {
-              // elements cannot currently span multiple lines
-              do
-                {
-                  buf << "<tt>";
-                  cfpod = expand_cfpod (pl, buf, cfpod, -2);
-                  buf << "</tt>\n";
-                }
-              while (*cfpod == ' ');
-
-              while (*cfpod == '\n')
-                buf << *cfpod++;
-            }
+            goto verbatim;
 
           break;
 
@@ -402,6 +406,7 @@
                 case 'I': pfx = "<i>"     ; sfx = "</i>"      ; break;
                 case 'U': pfx = "<u>"     ; sfx = "</u>"      ; break;
                 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
+                case 'Z': pfx = ""        ; sfx = ""          ; break;
 
                 case 'H': // hint
                   {
@@ -411,24 +416,24 @@
                         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;
 
                 case 'G': // gender
                   {
-                    expand_cfpod (pl, nest, cfpod, end);
+                    cfpod = expand_cfpod (pl, nest, cfpod, end);
                     nest << '\0'; // zero-terminate
 
                     const char *str = nest.linearise ();
@@ -436,7 +441,7 @@
 
                     if (sep)
                       {
-                        if (pl->gender || 1)
+                        if (pl->gender)
                           buf.add (sep + 1, nest.size () - (sep - str) - 2);
                         else
                           buf.add (str, sep - str);
@@ -460,6 +465,21 @@
             buf << ch;
           skip:
             break;
+
+        verbatim:
+          // elements cannot currently span multiple lines
+          do
+            {
+              buf << "<tt>";
+              cfpod = expand_cfpod (pl, buf, cfpod, -2);
+              buf << "</tt>\n";
+
+              while (*cfpod == '\n')
+                buf << *cfpod++;
+            }
+          while (*cfpod == ' ');
+
+          break;
       }
 }
 
@@ -469,7 +489,7 @@
   static dynbuf_text buf(1024, 1024);
   buf.clear ();
 
-  ::expand_cfpod (this, buf, cfpod, 0);
+  ::expand_cfpod (this, buf, cfpod);
 
   return &buf;
 }