--- deliantra/server/common/player.C	2008/08/29 02:07:09	1.40
+++ deliantra/server/common/player.C	2008/09/08 18:34:35	1.43
@@ -78,6 +78,7 @@
   PL_OUT  (password);
   PL_OUT2 (title, own_title);
   PL_OUT  (gender);
+  PL_OUT  (hintmode);
   PL_OUT  (gen_hp);
   PL_OUT  (gen_sp);
   PL_OUT  (gen_grace);
@@ -191,6 +192,7 @@
           case KW_bowtype:       pl->bowtype   = (bowtype_t) f.get_sint32 (); break;
           case KW_petmode:       pl->petmode   = (petmode_t) f.get_sint32 (); break;
           case KW_gender:        f.get (pl->gender); break;
+          case KW_hintmode:      f.get (pl->hintmode); break;
           case KW_listening:     /*TODO*/; break;
           case KW_peaceful:      f.get (pl->peaceful); break;
           case KW_digestion:     f.get (pl->digestion); break;
@@ -286,3 +288,189 @@
   return buf;
 }
 
+// expand one level of cfpod
+// end == -2, till '\n'
+// end == -1, till '>'
+// end == 0, till eos
+// end >= 1, levels of " >>>"
+static const char *
+expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end)
+{
+  static dynbuf_text nest(128, 128);
+
+  for (;;)
+    switch (char ch = *cfpod++)
+      {
+        case 0:
+          return cfpod - 1;
+
+        case ' ':
+          if (end < 1)
+            goto passthrough;
+
+          for (int i = 0; i < end; ++i)
+            if (cfpod [i] != '>')
+              goto passthrough;
+
+          return cfpod + end;
+
+        case '>':
+          if (end != -1)
+            {
+              buf << "&gt;";
+              break;
+            }
+
+          return cfpod;
+
+        case '&':
+          buf << "&amp;";
+          break;
+
+        case '<':
+          buf << "&lt;";
+          break;
+
+        case '\r':
+          buf << '\n';
+          break;
+
+        case '\n':
+          if (end == -2)
+            return cfpod;
+
+          // \n\  => newline, tt
+          // \n\n => \n\n
+          // \n   => single space
+
+          // two or more newlines will be copied verbatim, one is replaced by space
+          if (*cfpod == '\n')
+            {
+              --cfpod;
+              do
+                buf << *cfpod++;
+              while (*cfpod == '\n');
+            }
+          else if (*cfpod != ' ')
+            buf << ' ';
+
+          // start verbatim block's?
+          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++;
+            }
+
+          break;
+
+        case 'B': case 'C': case 'E': case 'G':
+        case 'H': case 'I': case 'T': case 'U':
+        case 'Z':
+          {
+            int end = 0;
+
+            while (cfpod [end] == '<')
+              ++end;
+
+            if (!end)
+              goto passthrough;
+
+            if (end == 1 || cfpod [end] != ' ')
+              {
+                end = -1;
+                ++cfpod;
+              }
+            else
+              cfpod += end + 1;
+
+            const char *pfx, *sfx;
+
+            switch (ch)
+              {
+                case 'B': pfx = "<b>"     ; sfx = "</b>"      ; break;
+                case 'C': pfx = "<tt>"    ; sfx = "</tt>"     ; break;
+                case 'E': pfx = "&"       ; sfx = ";"         ; break;
+                case 'I': pfx = "<i>"     ; sfx = "</i>"      ; break;
+                case 'U': pfx = "<u>"     ; sfx = "</u>"      ; break;
+                case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
+
+                case 'H': // hint
+                  {
+                    if (pl->hintmode)
+                      {
+                        cfpod = expand_cfpod (pl, nest, cfpod, end);
+                        nest.clear ();
+
+                        if (pl->hintmode == 1)
+                          buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>";
+                        else
+                          while (*cfpod == ' ') // eat trailing whitespace
+                            ++cfpod;
+
+                        goto skip;
+                      }
+                    else
+                      {
+                        pfx = "<fg name=\"lightblue\">[";
+                        sfx = " (Use hintmode to suppress hints)]</fg>";
+                      }
+                  }
+                  break;
+
+                case 'G': // gender
+                  {
+                    expand_cfpod (pl, nest, cfpod, end);
+                    nest << '\0'; // zero-terminate
+
+                    const char *str = nest.linearise ();
+                    const char *sep = strchr (str, '|');
+
+                    if (sep)
+                      {
+                        if (pl->gender || 1)
+                          buf.add (sep + 1, nest.size () - (sep - str) - 2);
+                        else
+                          buf.add (str, sep - str);
+                      }
+
+                    nest.clear ();
+
+                    goto skip;
+                  }
+              }
+
+            buf << pfx;
+            cfpod = expand_cfpod (pl, buf, cfpod, end);
+            buf << sfx;
+          }
+
+          break;
+
+        default:
+          passthrough:
+            buf << ch;
+          skip:
+            break;
+      }
+}
+
+dynbuf_text *
+player::expand_cfpod (const char *cfpod) const
+{
+  static dynbuf_text buf(1024, 1024);
+  buf.clear ();
+
+  ::expand_cfpod (this, buf, cfpod, 0);
+
+  return &buf;
+}
+