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

Comparing deliantra/server/common/player.C (file contents):
Revision 1.44 by root, Tue Sep 9 10:51:59 2008 UTC vs.
Revision 1.48 by root, Sun Dec 28 06:59:26 2008 UTC

                   }
                   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);
                       }
           do
             {
               buf << "<tt>";
               cfpod = expand_cfpod (pl, buf, cfpod, -2);
               buf << "</tt>\n";
+              while (*cfpod == '\n')
+                buf << *cfpod++;
             }
           while (*cfpod == ' ');
-          while (*cfpod == '\n')
-            buf << *cfpod++;
           break;
       }
 }
 dynbuf_text *

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