[ViewVC] Diff of: cvs/deliantra/server/socket/item.C

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.33 by root, Fri Jan 12 01:29:13 2007 UTC vs.
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC

   flags = query_flags (head);
   if (QUERY_FLAG (head, FLAG_NO_PICK))
     flags |= F_NOPICK;
-  if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE))
+  ns.send_face (head->face);
-    esrv_send_face (&ns, head->face->number, 0);
   if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
-    esrv_send_animation (&ns, head->animation_id);
+    ns.send_animation (head->animation_id);
   sl << uint32 (head->count)
      << uint32 (flags)
      << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
-     << uint32 (head->face->number);
+     << uint32 (head->face);
   if (!head->custom_name)
     {
       strncpy (item_n, query_base_name (head, 0), 127);
       item_n[127] = 0;
     {
       if (head->anim_speed)
         anim_speed = head->anim_speed;
       else
         {
-          if (FABS (head->speed) < 0.001)
+          if (fabs (head->speed) < 0.001)
             anim_speed = 255;
-          else if (FABS (head->speed) >= 1.0)
+          else if (fabs (head->speed) >= 1.0)
             anim_speed = 1;
           else
-            anim_speed = (int) (1.0 / FABS (head->speed));
+            anim_speed = (int) (1.0 / fabs (head->speed));
         }
       if (anim_speed > 255)
         anim_speed = 255;
     }
  */
 void
 esrv_draw_look (object *pl)
 {
   int got_one = 0, start_look = 0, end_look = 0;
-  char buf[MAX_BUF];
   if (!pl->contr->ns->update_look)
     {
-      LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
+      LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
       return;
     }
   else
     pl->contr->ns->update_look = 0;
   packet sl;
   sl.printf ("item%d ", pl->contr->ns->itemcmd);
   sl << uint32 (0);
-  if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
+  pl->contr->ns->send_face (empty_face);
-    esrv_send_face (pl->contr->ns, empty_face->number, 0);
   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->ns->look_position - FLOORBOX_PAGESIZE))
          << uint32 (0)
          << sint32 (-1)
-         << uint32 (empty_face->number)
+         << uint32 (empty_face)
          << data8 (buf)
          << uint16 (0)
          << uint8  (0)
          << uint32 (0);
                * we notice the special tag the object has, and act accordingly.
                */
               sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
                  << uint32 (0)
                  << uint32 ((uint32) - 1)
-                 << uint32 (empty_face->number)
+                 << uint32 (empty_face)
                  << data8  ("Apply this to see next group of items")
                  << uint16 (0)
                  << uint8  (0)
                  << uint32 (0);
  *
  * flags is a list of values to update
  * to the client (as defined in newclient.h - might as well use the
  * same value both places.
  */
 void
 esrv_update_item (int flags, object *pl, object *op)
 {
   /* If we have a request to send the player item, skip a few checks. */
   if (op != pl)
         ns->last_weight = weight;
     }
   if (flags & UPD_FACE)
     {
-      if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
+      ns->send_face (op->face);
-        esrv_send_face (ns, op->face->number, 0);
-      sl << uint32 (op->face->number);
+      sl << uint32 (op->face);
     }
   if (flags & UPD_NAME)
     {
       int len;
         {
           if (op->anim_speed)
             anim_speed = op->anim_speed;
           else
             {
-              if (FABS (op->speed) < 0.001)
+              if (fabs (op->speed) < 0.001)
                 anim_speed = 255;
-              else if (FABS (op->speed) >= 1.0)
+              else if (fabs (op->speed) >= 1.0)
                 anim_speed = 1;
               else
-                anim_speed = (int) (1.0 / FABS (op->speed));
+                anim_speed = (int) (1.0 / fabs (op->speed));
             }
           if (anim_speed > 255)
             anim_speed = 255;
         }
  * Sends item's info to player.
  */
 void
 esrv_send_item (object *pl, object *op)
 {
+  if (!pl->contr->ns)
+    return;
   /* If this is not the player object, do some more checks */
   if (op != pl)
     {
       /* We only send 'visibile' objects to the client */
       if (!op->client_visible ())
 /**
  * Tells the client to delete an item.  Uses the item
  * command with a -1 location.
  */
 void
 esrv_del_item (player *pl, int tag)
 {
+  if (!pl->ns)
+    return;
   packet sl ("delitem");
   sl << uint32 (tag);
   pl->ns->send_packet (sl);
       else
         new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
     }
 }
 /** Client wants to look at some object.  Lets do so. */
 void
 LookAt (char *buf, int len, player *pl)
 {
   int dx, dy;
     {
       return;
     }
   dy = atoi (cp);
-  if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
+  if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
     return;
   if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
     return;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/socket/item.C (file contents): Revision 1.33 by root, Fri Jan 12 01:29:13 2007 UTC vs. Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.33 by root, Fri Jan 12 01:29:13 2007 UTC vs.
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC