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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.46 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.56 by elmex, Mon Nov 26 11:41:02 2007 UTC

 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * Deliantra is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /**
  * \file
  * Client/server logic.
   flags = query_flags (head);
   if (QUERY_FLAG (head, FLAG_NO_PICK))
     flags |= F_NOPICK;
-  ns.send_face (head->face);
+  ns.send_face (head->face, -50);
   ns.flush_fx ();
   if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
     ns.send_animation (head->animation_id);
   packet sl;
   sl.printf ("item%d ", pl->ns->itemcmd);
   sl << uint32 (0);
-  pl->ns->send_face (empty_face);
+  pl->ns->send_face (empty_face, -50);
   pl->ns->flush_fx ();
   if (pl->ns->look_position)
     {
       char buf[80];
             head = tmp;
           add_object_to_socklist (*pl->ns, sl, head);
           got_one++;
-          if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
+          if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
             {
               pl->ns->send_packet (sl);
               sl.reset ();
               sl.printf ("item%d ", pl->ns->itemcmd);
           /* IT is possible for players to accumulate a huge amount of
            * items (especially with some of the bags out there) to
            * overflow the buffer.  IF so, send multiple item commands.
            */
-          if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
+          if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
             {
               pl->contr->ns->send_packet (sl);
               sl.reset ();
               sl.printf ("item%d ", pl->contr->ns->itemcmd);
         ns->last_weight = weight;
     }
   if (flags & UPD_FACE)
     {
-      ns->send_face (op->face);
+      ns->send_face (op->face, -50);
       ns->flush_fx ();
       sl << uint32 (op->face);
     }
   if (flags & UPD_NAME)
  * look_at prints items on the specified square.
  *
  * [ removed EARTHWALL check and added check for containers inventory.
  *   Tero.Haatanen@lut.fi ]
  */
-void
+static void
-look_at (object *op, int dx, int dy)
+look_at (player *pl, int dx, int dy)
 {
-  object *tmp;
+  dynbuf_text buf;
-  int flag = 0;
+  object *ob = pl->ob;
-  sint16 x, y;
-  maptile *m;
-  x = op->x + dx;
+  if (!pl->observe->map)
-  y = op->y + dy;
-  if (out_of_map (op->map, x, y))
     return;
-  m = get_map_from_coord (op->map, &x, &y);
+  mapxy pos (pl->observe);
-  if (!m)
+  pos.move (dx, dy);
-    return;
-  for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)
+  if (pos.normalise ())
-    ;
+    for (object *tmp = pos->top; tmp; tmp = tmp->below)
-  for (; tmp; tmp = tmp->below)
-    {
+      {
-      if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
+        if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
-        continue;
+          continue;
-      if (!flag)
-        {
-          if (dx || dy)
-            new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
-          else
-            {
-              clear_win_info (op);
-              new_draw_info (NDI_UNIQUE, 0, op, "You see:");
-            }
-          flag = 1;
-        }
-      if (QUERY_FLAG (op, FLAG_WIZ))
+        if (QUERY_FLAG (ob, FLAG_WIZ))
-        new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
+          buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
-      else
+        else
-        new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
+          buf.printf ("- %s.\n", query_name (tmp));
-      if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
+        object *head = tmp->head_ ();
-           (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
-        inventory (op, tmp->head == NULL ? tmp : tmp->head);
+        if (head->inv)
+          if ((head->type != CONTAINER && head->type != FLESH)
+              || QUERY_FLAG (ob, FLAG_WIZ))
+            buf << head->query_inventory (ob, "  ");
-      if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ))        /* don't continue under the floor */
+        if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ))        /* don't continue under the floor */
-        break;
+          break;
-    }
+      }
-  if (!flag)
+  if (buf.empty ())
-    {
+    pl->failmsg ("You see nothing there.");
-      if (dx || dy)
-        new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
-      else
+  else
-        new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
+    pl->infobox (MSG_CHANNEL ("lookat"), buf);
-    }
 }
 /** Client wants to look at some object.  Lets do so. */
 void
 LookAt (char *buf, int len, player *pl)
 {
-  int dx, dy;
   char *cp;
-  dx = atoi (buf);
+  int dx = atoi (buf);
   if (!(cp = strchr (buf, ' ')))
     return;
-  dy = atoi (cp);
+  int dy = atoi (cp);
+  if (player *opl = pl->observe->contr)
+    if (client *ns = opl->ns)
+      {
-  if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
+        if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
-    return;
+          return;
-  if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
+        if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
-    return;
+          return;
+      }
-  look_at (pl->ob, dx, dy);
+  look_at (pl, dx, dy);
 }
 /** Move an object to a new location */
 void
 esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
           object *current, *next;
+          int cnt = MAX_ITEM_PER_DROP;
           for (current = op->inv; current != NULL; current = next)
             {
               next = current->below;
               drop_object (pl, current, 0);
+              if (--cnt <= 0) break;
             }
+          if (cnt <= 0)
+            pl->failmsg (format (
+              "Moved only %d items, you can't move more than that at once.",
+              MAX_ITEM_PER_DROP
+            ));
           esrv_update_item (UPD_WEIGHT, pl, op);
         }
       else
         drop_object (pl, op, nrof);

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.46 by root, Sun Jun 3 17:05:36 2007 UTC vs. Revision 1.56 by elmex, Mon Nov 26 11:41:02 2007 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.46 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.56 by elmex, Mon Nov 26 11:41:02 2007 UTC