--- deliantra/server/common/player.C	2009/10/19 21:48:49	1.56
+++ deliantra/server/common/player.C	2010/01/16 12:33:46	1.61
@@ -24,6 +24,8 @@
 
 #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
@@ -72,8 +74,8 @@
   if (ob->map)
     maplevel = ob->map->path;
 
-#define PL_OUT(k)    freezer.put (KW_ ## k, k)
-#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
+#define PL_OUT(k)    freezer.put (KW(k), k)
+#define PL_OUT2(k,v) freezer.put (KW(k), v)
 
   PL_OUT  (password);
   PL_OUT2 (title, own_title);
@@ -90,8 +92,8 @@
   PL_OUT  (outputs_sync);
   PL_OUT  (outputs_count);
 
-  freezer.put (KW_usekeys, usekeys == key_inventory    ? "key_inventory"    : (usekeys == keyrings      ? "keyrings"      : "containers"));
-  freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
+  freezer.put (KW(usekeys), usekeys == key_inventory    ? CS(key_inventory)    : (usekeys == keyrings      ? CS(keyrings)      : CS(containers)));
+  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);
@@ -117,14 +119,11 @@
     }
 
   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;
 
@@ -135,6 +134,8 @@
   return true;
 }
 
+//-GPL
+
 bool
 player::save_pl (const char *path)
 {
@@ -268,7 +269,7 @@
   return 0;
 }
 
-const char *
+const_utf8_string
 player::killer_name () const
 {
   static char buf [2048];
@@ -447,6 +448,11 @@
 
                     goto skip;
                   }
+
+                default:
+                   pfx = "UNKNOWN_DIRECTIVE{";
+                   sfx = "}";
+                   break;
               }
 
             buf << pfx;