[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.57 by root, Thu Nov 5 15:43:21 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
+//+GPL
 /* Determine if the attacktype represented by the
  * specified attack-number is enabled for dragon players.
  * A dragon player (quetzal) can gain resistances for
  * all enabled attacktypes.
 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;
 }
   INVOKE_PLAYER (SAVE, ob->contr);
   int wiz = ob->flag [FLAG_WIZ];
   /* Eneq(@csd.uu.se): If we have an open container hide it. */
-  object *container = ob->container;
+  object *container = ob->container_ ();
   ob->container = 0;
   if (ob->map)
     maplevel = ob->map->path;
   INVOKE_PLAYER (SAVE_DONE, ob->contr);
   return true;
 }
+//-GPL
 bool
 player::save_pl (const char *path)
 {
   object_freezer freezer;
 // 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] != '>')
           buf << "&lt;";
           break;
         case '\r':
           buf << '\n';
+          /* \r\n+ becomes one or more newlines */
+          while (*cfpod == '\n')
+            buf << *cfpod++;
           break;
         case '\n':
           if (end == -2)
             return cfpod;
               --cfpod;
               do
                 buf << *cfpod++;
               while (*cfpod == '\n');
             }
-          else if (*cfpod != ' ')
+          else if (*cfpod == ' ')
+            buf << '\n';
+          else
             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':
                 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 'Z': pfx = ""        ; sfx = ""          ; 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>";
+                          buf << "<fg name=\"lightblue\">[Hint available]</fg>";
                         else
-                          while (*cfpod == ' ') // eat trailing whitespace
+                          while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
                             ++cfpod;
                         goto skip;
                       }
                     else
                       {
-                        pfx = "<fg name=\"lightblue\">[";
+                        pfx = "<fg name=\"lightblue\">[Hint: ";
-                        sfx = " (Use hintmode to suppress hints)]</fg>";
+                        sfx = "]</fg>";
                       }
                   }
                   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 == '\n')
+                buf << *cfpod++;
+            }
+          while (*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.57 by root, Thu Nov 5 15:43:21 2009 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.57 by root, Thu Nov 5 15:43:21 2009 UTC