--- deliantra/server/socket/item.C 2007/07/29 19:11:47 1.52
+++ deliantra/server/socket/item.C 2008/04/23 07:49:57 1.62
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 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
+ * 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.
@@ -18,7 +18,7 @@
* 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
*/
/**
@@ -273,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)
@@ -348,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;
@@ -508,15 +508,8 @@
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)
- {
- if (!op->client_visible ())
- return;
- /* we remove the check for op->env, because in theory, the object
- * is hopefully in the same place, so the client should preserve
- * order.
- */
- }
+ if (op != pl && !op->client_visible ())
+ return;
client *ns = pl->contr->ns;
if (!ns)
@@ -548,12 +541,12 @@
if (flags & UPD_WEIGHT)
{
- sint32 weight = WEIGHT (op);
+ sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
- sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
-
- if (pl == op)
+ if (op)
ns->last_weight = weight;
+
+ sl << uint32 (weight);
}
if (flags & UPD_FACE)
@@ -637,7 +630,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;
@@ -667,8 +660,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)
@@ -802,7 +794,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;
}
@@ -823,12 +815,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)));
}
/**
@@ -840,58 +832,41 @@
static void
look_at (player *pl, int dx, int dy)
{
+ dynbuf_text buf;
object *ob = pl->ob;
- maptile *m = pl->observe->map;
- sint16 x = pl->observe->x + dx;
- sint16 y = pl->observe->y + dy;
-
- if (!m)
+ if (!pl->observe->map)
return;
- if (!xy_normalise (m, x, y))
- {
- new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
- return;
- }
-
- int flag = 0;
-
- for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
- {
- if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
- continue;
-
- if (!flag)
- {
- if (dx || dy)
- new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
- else
- new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
+ mapxy pos (pl->observe);
+ pos.move (dx, dy);
- flag = 1;
- }
-
- if (QUERY_FLAG (ob, FLAG_WIZ))
- new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
- else
- new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
+ if (pos.normalise ())
+ for (object *tmp = pos->top; tmp; tmp = tmp->below)
+ {
+ if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
+ continue;
- if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
- (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
- inventory (ob, tmp->head == NULL ? tmp : tmp->head);
+ if (QUERY_FLAG (ob, FLAG_WIZ))
+ buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
+ else
+ buf.printf ("- %s.\n", query_name (tmp));
+
+ object *head = 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 (ob, 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, ob, "You see nothing there.");
- else
- new_draw_info (NDI_UNIQUE, 0, ob, "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. */
@@ -942,15 +917,21 @@
*/
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);
@@ -980,7 +961,9 @@
* in a sack, so check for those things. We should also check
* 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))
+ if (env->type == CONTAINER
+ && can_pick (pl, op)
+ && sack_can_hold (pl, env, op, nrof))
put_object_in_sack (pl, env, op, nrof);
}