--- deliantra/server/socket/item.C	2007/04/23 19:10:17	1.44
+++ deliantra/server/socket/item.C	2007/06/03 17:05:36	1.46
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
- *
- * This program 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 2 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The author can be reached via e-mail to <crossfire@schmorp.de>
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT 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 2 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /**
@@ -333,40 +333,42 @@
  * because object ordering would otherwise be inconsistent.
  */
 void
-esrv_draw_look (object *pl)
+esrv_draw_look (player *pl)
 {
   int got_one = 0, start_look = 0, end_look = 0;
 
-  if (!pl->contr->ns->update_look)
+  object *ob = pl->ob;
+
+  if (!pl->ns->update_look)
     {
-      LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
+      LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
       return;
     }
   else
-    pl->contr->ns->update_look = 0;
+    pl->ns->update_look = 0;
 
-  if (QUERY_FLAG (pl, FLAG_REMOVED)
-      || !pl->map
-      || pl->map->in_memory != MAP_IN_MEMORY
-      || out_of_map (pl->map, pl->x, pl->y))
+  if (QUERY_FLAG (ob, FLAG_REMOVED)
+      || !ob->map
+      || ob->map->in_memory != MAP_IN_MEMORY
+      || out_of_map (ob->map, ob->x, ob->y))
     return;
 
-  pl->contr->ns->send_packet ("delinv 0");
+  pl->ns->send_packet ("delinv 0");
 
   packet sl;
-  sl.printf ("item%d ", pl->contr->ns->itemcmd);
+  sl.printf ("item%d ", pl->ns->itemcmd);
 
   sl << uint32 (0);
 
-  pl->contr->ns->send_face (empty_face);
-  pl->contr->ns->flush_fx ();
+  pl->ns->send_face (empty_face);
+  pl->ns->flush_fx ();
 
-  if (pl->contr->ns->look_position)
+  if (pl->ns->look_position)
     {
       char buf[80];
       snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
 
-      sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
+      sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
          << uint32 (0)
          << sint32 (-1)
          << uint32 (empty_face)
@@ -375,11 +377,11 @@
          << uint8  (0)
          << uint32 (0);
 
-      if (pl->contr->ns->itemcmd == 2)
+      if (pl->ns->itemcmd == 2)
         sl << uint16 (0);
     }
 
-  object *tmp = pl->ms ().top;
+  object *tmp = ob->ms ().top;
   for (object *last = 0; tmp != last; tmp = tmp->below)
     {
       object *head;
@@ -393,7 +395,7 @@
 
       if (tmp->client_visible ())
         {
-          if (++start_look < pl->contr->ns->look_position)
+          if (++start_look < pl->ns->look_position)
             continue;
 
           end_look++;
@@ -403,7 +405,7 @@
               /* What we basically do is make a 'fake' object - when the user applies it,
                * we notice the special tag the object has, and act accordingly.
                */
-              sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
+              sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
                  << uint32 (0)
                  << uint32 ((uint32) - 1)
                  << uint32 (empty_face)
@@ -412,7 +414,7 @@
                  << uint8  (0)
                  << uint32 (0);
 
-              if (pl->contr->ns->itemcmd == 2)
+              if (pl->ns->itemcmd == 2)
                 sl << uint16 (0);
 
               break;
@@ -423,15 +425,15 @@
           else
             head = tmp;
 
-          add_object_to_socklist (*pl->contr->ns, sl, head);
+          add_object_to_socklist (*pl->ns, sl, head);
           got_one++;
 
           if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
             {
-              pl->contr->ns->send_packet (sl);
+              pl->ns->send_packet (sl);
 
               sl.reset ();
-              sl.printf ("item%d ", pl->contr->ns->itemcmd);
+              sl.printf ("item%d ", pl->ns->itemcmd);
               sl << uint32 (0);
               got_one = 0;
             }
@@ -439,7 +441,7 @@
     }
   
   if (got_one)
-    pl->contr->ns->send_packet (sl);
+    pl->ns->send_packet (sl);
 
 }