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

Comparing deliantra/server/common/player.C (file contents):
Revision 1.47 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.62 by root, Sat Jan 16 13:41:37 2010 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,2010 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;
-#define PL_OUT(k)    freezer.put (KW_ ## k, k)
+#define PL_OUT(k)    freezer.put (KW(k), k)
-#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
+#define PL_OUT2(k,v) freezer.put (KW(k), v)
   PL_OUT  (password);
   PL_OUT2 (title, own_title);
   PL_OUT  (gender);
   PL_OUT  (hintmode);
   PL_OUT  (digestion);
   PL_OUT2 (pickup, mode);
   PL_OUT  (outputs_sync);
   PL_OUT  (outputs_count);
-  freezer.put (KW_usekeys, usekeys == key_inventory    ? "key_inventory"    : (usekeys == keyrings      ? "keyrings"      : "containers"));
+  freezer.put (KW(usekeys), usekeys == key_inventory    ? CS(key_inventory)    : (usekeys == keyrings      ? CS(keyrings)      : CS(containers)));
-  freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
+  freezer.put (KW(unapply), unapply == unapply_nochoice ? CS(unapply_nochoice) : (unapply == unapply_never ? CS(unapply_never) : CS(unapply_always)));
   PL_OUT2 (map, maplevel);
   PL_OUT  (savebed_map);
   PL_OUT  (bed_x);
   PL_OUT  (bed_y);
       freezer.add (levsp   [i]); freezer.add ('\n');
       freezer.add (levgrace[i]); freezer.add ('\n');
     }
   freezer.put (ob->contr);
-  freezer.put (KW_endplst);
+  freezer.put (KW(endplst));
-  SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
   CLEAR_FLAG (ob, FLAG_WIZ);
   ob->write (freezer);
-  CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
   /* Eneq(@csd.uu.se): Reveal the container if we have one. */
   ob->container = container;
   ob->flag [FLAG_WIZ] = wiz;
   INVOKE_PLAYER (SAVE_DONE, ob->contr);
   return true;
 }
+//-GPL
 bool
 player::save_pl (const char *path)
 {
   object_freezer freezer;
   pl->destroy ();
   return 0;
 }
-const char *
+const_utf8_string
 player::killer_name () const
 {
   static char buf [2048];
   if (!killer)
           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 << ' ';
           // verbatim block?
           if (*cfpod == ' ')
             goto verbatim;
                 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
                     nest.clear ();
                     goto skip;
                   }
+                default:
+                   pfx = "UNKNOWN_DIRECTIVE{";
+                   sfx = "}";
+                   break;
               }
             buf << pfx;
             cfpod = expand_cfpod (pl, buf, cfpod, end);
             buf << sfx;
           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 *

Diff Legend

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

Comparing deliantra/server/common/player.C (file contents): Revision 1.47 by root, Mon Sep 29 10:32:50 2008 UTC vs. Revision 1.62 by root, Sat Jan 16 13:41:37 2010 UTC

Diff Legend

Comparing deliantra/server/common/player.C (file contents):
Revision 1.47 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.62 by root, Sat Jan 16 13:41:37 2010 UTC