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

Comparing deliantra/server/common/player.C (file contents):
Revision 1.46 by root, Mon Sep 29 09:04:50 2008 UTC vs.
Revision 1.50 by root, Thu Jan 8 00:54:55 2009 UTC

 is_dragon_pl (const object *op)
 {
   if (op
       && op->type == PLAYER
       && op->arch
-      && op->arch->race
+      && op->arch->race == shstr_dragon)
-      && !strcmp (op->arch->race, "dragon"))
     return 1;
   return 0;
 }
 failure:
   LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
   if (pl->ob)
-    pl->ob->destroy (true);
+    pl->ob->destroy ();
   pl->destroy ();
   return 0;
 }
               --cfpod;
               do
                 buf << *cfpod++;
               while (*cfpod == '\n');
             }
-          else if (*cfpod != ' ')
+          else if (*cfpod == ' ')
+            buf << '\n';
+          else
             buf << ' ';
           // verbatim block?
           if (*cfpod == ' ')
             goto verbatim;
           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