[ViewVC] Diff of: cvs/deliantra/server/common/player.C

Comparing deliantra/server/common/player.C (file contents):
Revision 1.43 by root, Mon Sep 8 18:34:35 2008 UTC vs.
Revision 1.46 by root, Mon Sep 29 09:04:50 2008 UTC

 failure:
   LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
   if (pl->ob)
-    pl->ob->destroy ();
+    pl->ob->destroy (true);
   pl->destroy ();
   return 0;
 }
 // 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)
+expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0)
 {
   static dynbuf_text nest(128, 128);
   for (;;)
     switch (char ch = *cfpod++)
       {
         case 0:
           return cfpod - 1;
         case ' ':
+          // verbatim block?
+          if (!buf.size () && !end)
+            {
+              --cfpod;
+              goto verbatim;
+            }
           if (end < 1)
             goto passthrough;
           for (int i = 0; i < end; ++i)
             if (cfpod [i] != '>')
               while (*cfpod == '\n');
             }
           else if (*cfpod != ' ')
             buf << ' ';
-          // start verbatim block's?
+          // verbatim block?
           if (*cfpod == ' ')
-            {
+            goto verbatim;
-              // 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':
                   }
                   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 ();
                     const char *sep = strchr (str, '|');
                     if (sep)
                       {
-                        if (pl->gender || 1)
+                        if (pl->gender)
                           buf.add (sep + 1, nest.size () - (sep - str) - 2);
                         else
                           buf.add (str, sep - str);
                       }
         default:
           passthrough:
             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 == ' ');
+          while (*cfpod == '\n')
+            buf << *cfpod++;
+          break;
       }
 }
 dynbuf_text *
 player::expand_cfpod (const char *cfpod) const
 {
   static dynbuf_text buf(1024, 1024);
   buf.clear ();
-  ::expand_cfpod (this, buf, cfpod, 0);
+  ::expand_cfpod (this, buf, cfpod);
   return &buf;
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/player.C (file contents): Revision 1.43 by root, Mon Sep 8 18:34:35 2008 UTC vs. Revision 1.46 by root, Mon Sep 29 09:04:50 2008 UTC

Diff Legend

Comparing deliantra/server/common/player.C (file contents):
Revision 1.43 by root, Mon Sep 8 18:34:35 2008 UTC vs.
Revision 1.46 by root, Mon Sep 29 09:04:50 2008 UTC