--- deliantra/server/common/player.C	2009/09/16 23:33:24	1.52
+++ deliantra/server/common/player.C	2009/11/05 15:43:21	1.57
@@ -1,28 +1,31 @@
 /*
  * 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * 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
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * 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
@@ -65,7 +68,7 @@
   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)
@@ -134,6 +137,8 @@
   return true;
 }
 
+//-GPL
+
 bool
 player::save_pl (const char *path)
 {
@@ -411,17 +416,17 @@
                         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\">[";
-                        sfx = " (Use hintmode to suppress hints)]</fg>";
+                        pfx = "<fg name=\"lightblue\">[Hint: ";
+                        sfx = "]</fg>";
                       }
                   }
                   break;