--- deliantra/server/include/player.h	2009/11/19 04:30:46	1.99
+++ deliantra/server/include/player.h	2010/03/26 00:59:21	1.103
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -21,6 +21,7 @@
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
+
 #ifndef PLAYER_H_
 #define PLAYER_H_
 
@@ -74,10 +75,10 @@
 INTERFACE_CLASS (partylist)
 struct partylist
 {
-  char *ACC (RW, partyleader);
+  utf8_string ACC (RW, partyleader);
   char ACC (RW, passwd)[9];
   partylist *ACC (RW, next);
-  char *ACC (RW, partyname);
+  utf8_string ACC (RW, partyname);
 
   struct party_kill
   {
@@ -213,7 +214,7 @@
 
   shstr ACC (RW, invis_race);             /* What race invisible to? */
 
-  MTH const char *killer_name () const; // makes a string out of ->killer
+  MTH const_utf8_string killer_name () const; // makes a string out of ->killer
 
   MTH static player *create ();
   static player *find (const_utf8_string name);
@@ -225,12 +226,12 @@
   MTH object *find_skill (shstr_cmp name) const;
 
   bool save_pl (object_freezer &freezer);
-  MTH bool save_pl (const char *path);
+  MTH bool save_pl (const_octet_string path);
 
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  MTH dynbuf_text *expand_cfpod (const char *cfpod) const;
+  MTH dynbuf_text *expand_cfpod (const_utf8_string cfpod) const;
 
   MTH void touch () { dirty = true; } // need to touch when logged out and changed
 
@@ -256,7 +257,7 @@
   MTH void set_observe (object_ornull *ob);
   MTH void set_viewpoint (object_ornull *ob);
 
-  void send_msg (int color, const char *type, const char *msg)
+  void send_msg (int color, const_utf8_string type, const_utf8_string msg)
   {
     ns->send_msg (color, type, msg);
   }
@@ -264,16 +265,16 @@
   // a prominent box that can easily be escaped away or so
   // should be used for informative output such as who, maps etc.
   // will stay on-screen
-  MTH void infobox (const char *title, const char *msg, int color = NDI_BLACK);
+  MTH void infobox (const_utf8_string title, const_utf8_string msg, int color = NDI_BLACK);
 
   // a prominent msg that signifies some important event,
   // an improvement potion effect potion. should not be long.
   // might time out after a while
-  MTH void statusmsg (const char *msg, int color = NDI_BLACK);
+  MTH void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
 
   // a prominent box that signifies some error such as a failed
   // improvement potion. should not be long.
-  MTH void failmsg (const char *msg, int color = NDI_RED);
+  MTH void failmsg (const_utf8_string msg, int color = NDI_RED);
 
   MTH void update_spells () const
   {
@@ -301,15 +302,16 @@
     if ((var)->ob->map == (mapp))
 
 inline void
-object::statusmsg (const char *msg, int color)
+object::statusmsg (const_utf8_string msg, int color)
 {
   if (expect_true (contr)) contr->statusmsg (msg, color);
 }
 
 inline void
-object::failmsg (const char *msg, int color)
+object::failmsg (const_utf8_string msg, int color)
 {
   if (expect_true (contr)) contr->failmsg (msg, color);
 }
 
 #endif
+