--- deliantra/server/socket/item.C	2006/12/20 09:14:22	1.28
+++ deliantra/server/socket/item.C	2006/12/21 23:37:06	1.29
@@ -339,13 +339,13 @@
   int got_one = 0, start_look = 0, end_look = 0;
   char buf[MAX_BUF];
 
-  if (!pl->contr->socket->update_look)
+  if (!pl->contr->ns->update_look)
     {
       LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
       return;
     }
   else
-    pl->contr->socket->update_look = 0;
+    pl->contr->ns->update_look = 0;
 
   if (QUERY_FLAG (pl, FLAG_REMOVED)
       || !pl->map
@@ -356,22 +356,22 @@
   for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
     ;
 
-  pl->contr->socket->send_packet ("delinv 0");
+  pl->contr->ns->send_packet ("delinv 0");
 
   packet sl;
-  sl.printf ("item%d ", pl->contr->socket->itemcmd);
+  sl.printf ("item%d ", pl->contr->ns->itemcmd);
 
   sl << uint32 (0);
 
-  if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))
-    esrv_send_face (pl->contr->socket, empty_face->number, 0);
+  if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
+    esrv_send_face (pl->contr->ns, empty_face->number, 0);
 
-  if (pl->contr->socket->look_position)
+  if (pl->contr->ns->look_position)
     {
       char buf[80];
       snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
 
-      sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE))
+      sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
          << uint32 (0)
          << sint32 (-1)
          << uint32 (empty_face->number)
@@ -380,7 +380,7 @@
          << uint8  (0)
          << uint32 (0);
 
-      if (pl->contr->socket->itemcmd == 2)
+      if (pl->contr->ns->itemcmd == 2)
         sl << uint16 (0);
     }
 
@@ -397,7 +397,7 @@
 
       if (LOOK_OBJ (tmp))
         {
-          if (++start_look < pl->contr->socket->look_position)
+          if (++start_look < pl->contr->ns->look_position)
             continue;
 
           end_look++;
@@ -407,7 +407,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->socket->look_position + FLOORBOX_PAGESIZE))
+              sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
                  << uint32 (0)
                  << uint32 ((uint32) - 1)
                  << uint32 (empty_face->number)
@@ -416,7 +416,7 @@
                  << uint8  (0)
                  << uint32 (0);
 
-              if (pl->contr->socket->itemcmd == 2)
+              if (pl->contr->ns->itemcmd == 2)
                 sl << uint16 (0);
 
               break;
@@ -427,15 +427,15 @@
           else
             head = tmp;
 
-          add_object_to_socklist (*pl->contr->socket, sl, head);
+          add_object_to_socklist (*pl->contr->ns, sl, head);
           got_one++;
 
           if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
             {
-              pl->contr->socket->send_packet (sl);
+              pl->contr->ns->send_packet (sl);
 
               sl.reset ();
-              sl.printf ("item%d ", pl->contr->socket->itemcmd);
+              sl.printf ("item%d ", pl->contr->ns->itemcmd);
               sl << uint32 (0);
               got_one = 0;
             }
@@ -443,7 +443,7 @@
     }
   
   if (got_one)
-    pl->contr->socket->send_packet (sl);
+    pl->contr->ns->send_packet (sl);
 
 }
 
@@ -457,10 +457,10 @@
   int got_one = 0;
 
 
-  pl->contr->socket->send_packet_printf ("delinv %d", op->count);
+  pl->contr->ns->send_packet_printf ("delinv %d", op->count);
 
   packet sl;
-  sl.printf ("item%d ", pl->contr->socket->itemcmd);
+  sl.printf ("item%d ", pl->contr->ns->itemcmd);
 
   sl << uint32 (op->count);
 
@@ -475,7 +475,7 @@
 
       if (LOOK_OBJ (head))
         {
-          add_object_to_socklist (*pl->contr->socket, sl, head);
+          add_object_to_socklist (*pl->contr->ns, sl, head);
 
           got_one++;
 
@@ -485,10 +485,10 @@
            */
           if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
             {
-              pl->contr->socket->send_packet (sl);
+              pl->contr->ns->send_packet (sl);
 
               sl.reset ();
-              sl.printf ("item%d ", pl->contr->socket->itemcmd);
+              sl.printf ("item%d ", pl->contr->ns->itemcmd);
               sl << uint32 (op->count);
               got_one = 0;
             }
@@ -496,7 +496,7 @@
     }
 
   if (got_one)
-    pl->contr->socket->send_packet (sl);
+    pl->contr->ns->send_packet (sl);
 }
 
 /**
@@ -557,8 +557,8 @@
 
   if (flags & UPD_FACE)
     {
-      if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))
-        esrv_send_face (pl->contr->socket, op->face->number, 0);
+      if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
+        esrv_send_face (pl->contr->ns, op->face->number, 0);
 
       sl << uint32 (op->face->number);
     }
@@ -622,7 +622,7 @@
   if (flags & UPD_NROF)
     sl << uint32 (op->nrof);
 
-  pl->contr->socket->send_packet (sl);
+  pl->contr->ns->send_packet (sl);
 }
 
 /**
@@ -642,23 +642,23 @@
        */
       if (!op->env)
         {
-          pl->contr->socket->floorbox_update ();
+          pl->contr->ns->floorbox_update ();
           return;
         }
     }
 
   packet sl;
 
-  sl.printf ("item%d ", pl->contr->socket->itemcmd);
+  sl.printf ("item%d ", pl->contr->ns->itemcmd);
 
   if (op->head)
     op = op->head;
 
   sl << uint32 (op->env ? op->env->count : 0);
 
-  add_object_to_socklist (*pl->contr->socket, sl, op);
+  add_object_to_socklist (*pl->contr->ns, sl, op);
 
-  pl->contr->socket->send_packet (sl);
+  pl->contr->ns->send_packet (sl);
   SET_FLAG (op, FLAG_CLIENT_SENT);
 }
 
@@ -674,7 +674,7 @@
 
   sl << uint32 (tag);
 
-  pl->socket->send_packet (sl);
+  pl->ns->send_packet (sl);
 }
 
 
@@ -755,8 +755,8 @@
   /* If the high bit is set, player applied a pseudo object. */
   if (tag & 0x80000000)
     {
-      pl->socket->look_position = tag & 0x7fffffff;
-      pl->socket->floorbox_update ();
+      pl->ns->look_position = tag & 0x7fffffff;
+      pl->ns->floorbox_update ();
       return;
     }
 
@@ -891,10 +891,10 @@
     }
   dy = atoi (cp);
 
-  if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
+  if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
     return;
 
-  if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
+  if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
     return;
 
   look_at (pl->ob, dx, dy);