--- deliantra/server/socket/item.C 2007/06/03 17:05:36 1.46
+++ deliantra/server/socket/item.C 2008/04/22 07:01:47 1.60
@@ -1,25 +1,24 @@
/*
- * 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,2008 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
- * 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.
+ * 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.
*
- * 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.
+ * 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
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/**
@@ -266,7 +265,7 @@
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])
@@ -274,7 +273,7 @@
sl << uint32 (head->count)
<< uint32 (flags)
- << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
+ << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
<< uint32 (head->face);
if (!head->custom_name)
@@ -349,7 +348,7 @@
if (QUERY_FLAG (ob, FLAG_REMOVED)
|| !ob->map
- || ob->map->in_memory != MAP_IN_MEMORY
+ || ob->map->in_memory != MAP_ACTIVE
|| out_of_map (ob->map, ob->x, ob->y))
return;
@@ -360,7 +359,7 @@
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)
@@ -428,7 +427,7 @@
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);
@@ -482,7 +481,7 @@
* 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);
@@ -549,17 +548,19 @@
if (flags & UPD_WEIGHT)
{
- sint32 weight = WEIGHT (op);
+ sint32 weight = op->client_weight ();
sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
+#if 0
if (pl == op)
ns->last_weight = weight;
+#endif
}
if (flags & UPD_FACE)
{
- ns->send_face (op->face);
+ ns->send_face (op->face, -50);
ns->flush_fx ();
sl << uint32 (op->face);
}
@@ -638,7 +639,7 @@
/* If this is not the player object, do some more checks */
if (op != pl)
{
- /* We only send 'visibile' objects to the client */
+ /* We only send 'visible' objects to the client */
if (!op->client_visible ())
return;
@@ -668,8 +669,7 @@
}
/**
- * Tells the client to delete an item. Uses the item
- * command with a -1 location.
+ * Tells the client to delete an item.
*/
void
esrv_del_item (player *pl, int tag)
@@ -803,7 +803,7 @@
if (!op)
{
- new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
+ pl->failmsg ("Could not find object to lock/unlock");
return;
}
@@ -824,12 +824,12 @@
if (!op)
{
- new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
+ pl->failmsg ("Could not find object to mark");
return;
}
pl->mark = op;
- new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));
+ pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
}
/**
@@ -838,85 +838,69 @@
* [ removed EARTHWALL check and added check for containers inventory.
* Tero.Haatanen@lut.fi ]
*/
-void
-look_at (object *op, int dx, int dy)
+static void
+look_at (player *pl, int dx, int dy)
{
- object *tmp;
- int flag = 0;
- sint16 x, y;
- maptile *m;
-
- x = op->x + dx;
- y = op->y + dy;
+ dynbuf_text buf;
+ object *ob = pl->ob;
- if (out_of_map (op->map, x, y))
+ if (!pl->observe->map)
return;
- m = get_map_from_coord (op->map, &x, &y);
- if (!m)
- return;
+ mapxy pos (pl->observe);
+ pos.move (dx, dy);
- 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)
+ {
+ if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
+ continue;
- for (; tmp; tmp = tmp->below)
- {
- if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
- continue;
+ if (QUERY_FLAG (ob, FLAG_WIZ))
+ buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
+ else
+ buf.printf ("- %s.\n", query_name (tmp));
- 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;
- }
+ object *head = tmp->head_ ();
- if (QUERY_FLAG (op, FLAG_WIZ))
- new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
- else
- new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
-
- if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
- (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 */
- break;
- }
+ if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
+ break;
+ }
- if (!flag)
- {
- if (dx || dy)
- new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
- else
- new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
- }
+ if (buf.empty ())
+ pl->failmsg ("You see nothing there.");
+ else
+ 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);
- if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
- return;
+ int dy = atoi (cp);
- if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
- return;
+ if (player *opl = pl->observe->contr)
+ if (client *ns = opl->ns)
+ {
+ if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
+ return;
- look_at (pl->ob, dx, dy);
+ if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
+ return;
+ }
+
+ look_at (pl, dx, dy);
}
/** Move an object to a new location */
@@ -942,19 +926,27 @@
*/
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)
+ for (object *current = op->inv; current; )
{
- next = current->below;
+ object *next = current->below;
+
drop_object (pl, current, 0);
+
+ if (--cnt <= 0) break;
+
+ current = next;
}
- esrv_update_item (UPD_WEIGHT, pl, op);
+ if (cnt <= 0)
+ op->failmsg ("Only dropped some items, can't drop that many items at once.");
}
else
drop_object (pl, op, nrof);
+ update_after_inventory_change (pl);
+
return;
}
else if (to == pl->count)
@@ -981,6 +973,9 @@
* an make sure env is in fact a container for that matter.
*/
if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
- put_object_in_sack (pl, env, op, nrof);
+ {
+ put_object_in_sack (pl, env, op, nrof);
+ update_after_inventory_change (pl);
+ }
}