--- deliantra/server/common/player.C	2008/04/21 23:35:24	1.36
+++ deliantra/server/common/player.C	2008/09/08 11:27:24	1.41
@@ -78,10 +78,10 @@
   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);
-  PL_OUT  (listening);
   PL_OUT  (bowtype);
   PL_OUT  (petmode);
   PL_OUT  (peaceful);
@@ -192,7 +192,8 @@
           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_listening:     f.get (pl->listening); 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;
           case KW_pickup:        f.get (pl->mode); break;
@@ -267,3 +268,182 @@
   return 0;
 }
 
+const char *
+player::killer_name () const
+{
+  static char buf [2048];
+
+  if (!killer)
+    return "a dungeon collapse";
+  else if (killer->contr)
+    snprintf (buf, sizeof (buf), "%s the %s", &killer->name,
+              *killer->contr->own_title ? killer->contr->own_title : killer->contr->title);
+  else if (killer->type == DEEP_SWAMP)
+    snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name);
+  else if (killer->owner)
+    snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name);
+  else
+    return &killer->name;
+
+  return buf;
+}
+
+// expand one level of cfpod
+// end == -1, till eos
+// end == 0, one level of '>'
+// end >= 1,  this many 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 <= 0)
+            goto passthrough;
+
+          for (int i = 0; i < end; ++i)
+            if (cfpod [i] != '>')
+              goto passthrough;
+
+          return cfpod + end;
+
+        case '>':
+          if (end)
+            {
+              buf << "&gt;";
+              break;
+            }
+
+          return cfpod;
+
+        case '&':
+          buf << "&amp;";
+          break;
+
+        case '<':
+          buf << "&lt;";
+          break;
+
+        case '\n':
+          if (*cfpod == ' ')
+            goto passthrough;
+          else if (*cfpod == '\n')
+            {
+              --cfpod;
+              while (*cfpod == '\n')
+                buf << *cfpod++;
+
+              goto skip;
+            }
+
+          buf << ' ';
+          break;
+
+        case 'B': case 'C': case 'E': case 'G':
+        case 'H': case 'I': case 'T': case 'U':
+        case 'Z':
+          {
+            int len = 0;
+
+            while (cfpod [len] == '<')
+              ++len;
+
+            if (!len)
+              goto passthrough;
+
+            if (len == 1 || cfpod [len] != ' ')
+              {
+                len = 0;
+                ++cfpod;
+              }
+            else
+              cfpod += len + 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, len);
+                        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, len);
+                    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, len);
+            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, -1);
+
+  return &buf;
+}
+