--- deliantra/server/socket/item.C 2008/05/05 22:03:22 1.64
+++ deliantra/server/socket/item.C 2010/04/28 11:39:45 1.95
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
*
- * 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -39,146 +40,6 @@
/** This is the maximum number of bytes we expect any one item to take up */
#define MAXITEMLEN 300
-#if 0
-tag_t
-client_container::tag () const
-{
- switch (type)
- {
- case CC_INVENTORY:
- return ns->pl->count;
- case CC_MAPSPACE:
- return 0;
- case CC_CONTAINER:
- return env->count;
- }
-
- abort ();
-}
-
-void
-client_container::clear ()
-{
- switch (type)
- {
- case CC_INVENTORY:
- abort ();
-
- case CC_MAPSPACE:
- case CC_CONTAINER:
- ns->send_packet_printf ("delinv %d", tag ());
- break;
- }
-
- for (iterator i = begin (); i != end (); ++i)
- i->op->seen_by = 0;
-
- vector< refitem, slice_allocator >::clear ();
-}
-
-inline iterator
-client_container::merge_item (iterator i, object *op)
-{
- if (i != end () && i->op == op)
- return ++i;
-
- if (op->seen_by)
- return; // seen by another entity already
-
- op->seen_by = this;
-
- refitem ref;
- ref.op = op;
-
- return insert (i, ref);
-}
-
-void
-client_container::update (int offset)
-{
- iterator i = begin ();
-
- switch (type)
- {
- case CC_INVENTORY:
- case CC_CONTAINER:
- {
- object *env = type == CC_INVENTORY
- ? ns->pl->ob
- : this->env;
-
- // pass 1, erase all objects no longer in container
- for (iterator j = begin (); j != end (); ++j)
- if (j->op->env != env)
- {
- j->op->seen_by = 0;
- erase (j);
- }
-
- // pass 2 merge items
- for (object *op = env->inv; op; op = op->below)
- {
- if (--offset < 0)
- i = merge_item (i, op);
- else if (offset < -FLOORBOX_PAGESIZE)
- break;
- }
- }
- break;
-
- case CC_MAPSPACE:
- {
- // pass 1, erase all objects no longer on space
- for (iterator j = begin (); j != end (); ++j)
- if (j->op->x != x || j->op->y != y || j->op->map != map)
- {
- j->op->seen_by = 0;
- erase (j);
- }
-
- // pass 2 merge items
- for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
- {
- if (--offset < 0)
- i = merge_item (i, op);
- else if (offset < -FLOORBOX_PAGESIZE)
- break;
- }
- }
- break;
- }
-
- // pass 3, erase all extra items
- for (iterator j = i; j != end (); ++j)
- j->op->seen_by = 0;
-
- if (i != end ())
- erase (i, end ());
-}
-
-void
-client_container::set_mapspace (maptile *map, int x, int y)
-{
- if (type == CC_MAPSPACE
- && this->map == map
- && this->x == x
- && this->y == y)
- return;
-
- clear ();
-
- type = CC_MAPSPACE;
- this->map = map;
- this->x = x;
- this->y = y;
-}
-
-void
-client_container::set_container (object *env)
-{
-}
-#endif
-
/*******************************************************************************
*
* Functions related to sending object data to the client.
@@ -189,12 +50,12 @@
* This is a similar to query_name, but returns flags
* to be sent to client.
*/
-unsigned int
+static unsigned int
query_flags (object *op)
{
unsigned int flags = 0;
- if (QUERY_FLAG (op, FLAG_APPLIED))
+ if (op->flag [FLAG_APPLIED])
switch (op->type)
{
case BOW:
@@ -227,22 +88,22 @@
break;
}
- if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
+ if (op->is_open_container ())
flags |= F_OPEN;
- if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
+ if (op->flag [FLAG_KNOWN_CURSED])
{
- if (QUERY_FLAG (op, FLAG_DAMNED))
+ if (op->flag [FLAG_DAMNED])
flags |= F_DAMNED;
- else if (QUERY_FLAG (op, FLAG_CURSED))
+ else if (op->flag [FLAG_CURSED])
flags |= F_CURSED;
}
- if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
+ if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
flags |= F_MAGIC;
- if (QUERY_FLAG (op, FLAG_UNPAID))
+ if (op->flag [FLAG_UNPAID])
flags |= F_UNPAID;
- if (QUERY_FLAG (op, FLAG_INV_LOCKED))
+ if (op->flag [FLAG_INV_LOCKED])
flags |= F_LOCKED;
return flags;
@@ -255,73 +116,53 @@
static void
add_object_to_socklist (client &ns, packet &sl, object *head)
{
- int flags, len, anim_speed;
- char item_n[MAX_BUF];
- const char *item_p;
+ int flags = query_flags (head);
- flags = query_flags (head);
- if (QUERY_FLAG (head, FLAG_NO_PICK))
+ if (head->flag [FLAG_NO_PICK])
flags |= F_NOPICK;
ns.send_face (head->face, -50);
- ns.flush_fx ();
- if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
+ if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
ns.send_animation (head->animation_id);
sl << uint32 (head->count)
<< uint32 (flags)
- << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
+ << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
<< uint32 (head->face);
if (!head->custom_name)
{
- strncpy (item_n, query_base_name (head, 0), 127);
- item_n[127] = 0;
- len = strlen (item_n);
- item_p = query_base_name (head, 1);
+ const char *name;
+ uint8 *len = sl.cur++; // patch up length later
+
+ name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
+ sl << uint8 (0);
+ name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
+
+ *len = sl.cur - len - 1;
}
else
{
- strncpy (item_n, head->custom_name, 127);
- item_n[127] = 0;
- len = strlen (item_n);
- item_p = head->custom_name;
- }
+ int len = min (head->custom_name.length (), 127);
- strncpy (item_n + len + 1, item_p, 127);
- item_n[254] = 0;
- len += strlen (item_n + 1 + len) + 1;
+ sl << uint8 (len * 2 + 1)
+ << data (head->custom_name, len)
+ << uint8 (0)
+ << data (head->custom_name, len);
+ }
- sl << data8 (item_n, len)
- << uint16 (head->animation_id);
+ sl << uint16 (head->animation_id);
- anim_speed = 0;
- if (QUERY_FLAG (head, FLAG_ANIMATE))
- {
- if (head->anim_speed)
- anim_speed = head->anim_speed;
- else
- {
- if (fabs (head->speed) < 0.001)
- anim_speed = 255;
- else if (fabs (head->speed) >= 1.0)
- anim_speed = 1;
- else
- anim_speed = (int) (1.0 / fabs (head->speed));
- }
-
- if (anim_speed > 255)
- anim_speed = 255;
- }
+ int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
+ : head->anim_speed ? clamp (head->anim_speed, 1, 255)
+ : 1. / clamp (head->speed, 1./255., 1./1.);
sl << uint8 (anim_speed)
<< uint32 (head->nrof);
if (ns.itemcmd == 2)
sl << uint16 (head->client_type);
-
- SET_FLAG (head, FLAG_CLIENT_SENT);
}
static faceidx
@@ -354,16 +195,24 @@
return;
}
- pl->ns->update_look = 0;
+ if (pl->ns->need_delinv0)
+ {
+ pl->ns->need_delinv0 = 0;
+ pl->ns->send_packet ("delinv 0");
+ }
+
+ if (pl->run_on)
+ return;
- if (QUERY_FLAG (ob, FLAG_REMOVED)
+ pl->ns->update_look = 0;
+ pl->ns->need_delinv0 = 1;
+
+ if (ob->flag [FLAG_REMOVED]
|| !ob->map
|| ob->map->in_memory != MAP_ACTIVE
|| out_of_map (ob->map, ob->x, ob->y))
return;
- pl->ns->send_packet ("delinv 0");
-
packet sl;
sl.printf ("item%d ", pl->ns->itemcmd);
@@ -439,6 +288,7 @@
// if packet got too large, send it and begin a new one
if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
{
+ pl->ns->flush_fx ();
pl->ns->send_packet (sl);
sl.reset ();
@@ -467,7 +317,10 @@
}
if (dirty)
- pl->ns->send_packet (sl);
+ {
+ pl->ns->flush_fx ();
+ pl->ns->send_packet (sl);
+ }
}
/**
@@ -509,6 +362,7 @@
*/
if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
{
+ pl->contr->ns->flush_fx ();
pl->contr->ns->send_packet (sl);
sl.reset ();
@@ -520,7 +374,10 @@
}
if (got_one)
- pl->contr->ns->send_packet (sl);
+ {
+ pl->contr->ns->flush_fx ();
+ pl->contr->ns->send_packet (sl);
+ }
}
/**
@@ -541,15 +398,6 @@
if (!ns)
return;
- if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
- {
- /* FLAG_CLIENT_SENT is debug only. We are using it to see where
- * this is happening - we can set a breakpoint here in the debugger
- * and track back the call.
- */
- LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
- }
-
packet sl ("upditem");
sl << uint8 (flags);
@@ -566,9 +414,9 @@
if (flags & UPD_WEIGHT)
{
- sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
+ sint32 weight = op->client_weight ();
- if (op)
+ if (op == pl)
ns->last_weight = weight;
sl << uint32 (weight);
@@ -585,26 +433,20 @@
{
int len;
const char *item_p;
- char item_n[MAX_BUF];
+ char item_n[127 * 2];
if (!op->custom_name)
{
- strncpy (item_n, query_base_name (op, 0), 127);
- item_n[127] = 0;
- len = strlen (item_n);
+ len = assign (item_n, query_base_name (op, 0), 127);
item_p = query_base_name (op, 1);
}
else
{
- strncpy (item_n, op->custom_name, 127);
- item_n[127] = 0;
- len = strlen (item_n);
- item_p = op->custom_name;
+ len = assign (item_n, &op->custom_name, 127);
+ item_p = &op->custom_name;
}
- strncpy (item_n + len + 1, item_p, 127);
- item_n[254] = 0;
- len += strlen (item_n + 1 + len) + 1;
+ len += assign (item_n + len, item_p, 127);
sl << data8 (item_n, len);
}
@@ -616,18 +458,18 @@
{
int anim_speed = 0;
- if (QUERY_FLAG (op, FLAG_ANIMATE))
+ if (op->flag [FLAG_ANIMATE])
{
if (op->anim_speed)
anim_speed = op->anim_speed;
else
{
- if (fabs (op->speed) < 0.001)
+ if (op->speed < 0.001)
anim_speed = 255;
- else if (fabs (op->speed) >= 1.0)
+ else if (op->speed >= 1.0)
anim_speed = 1;
else
- anim_speed = (int) (1.0 / fabs (op->speed));
+ anim_speed = 1. / op->speed;
}
if (anim_speed > 255)
@@ -666,8 +508,8 @@
add_object_to_socklist (*pl->contr->ns, sl, op);
+ pl->contr->ns->flush_fx ();
pl->contr->ns->send_packet (sl);
- SET_FLAG (op, FLAG_CLIENT_SENT);
}
/**
@@ -697,7 +539,7 @@
* Takes a player and object count (tag) and returns the actual object
* pointer, or null if it can't be found.
*/
-object *
+static object *
esrv_get_ob_from_count (object *pl, tag_t count)
{
if (pl->count == count)
@@ -706,7 +548,7 @@
for (object *op = pl->inv; op; op = op->below)
if (op->count == count)
return op;
- else if (op->type == CONTAINER && pl->container == op)
+ else if (op->type == CONTAINER && pl->container_ () == op)
for (object *tmp = op->inv; tmp; tmp = tmp->below)
if (tmp->count == count)
return tmp;
@@ -716,7 +558,7 @@
return op;
else if (op->count == count)
return op;
- else if (op->type == CONTAINER && pl->container == op)
+ else if (op->type == CONTAINER && pl->container_ () == op)
for (object *tmp = op->inv; tmp; tmp = tmp->below)
if (tmp->count == count)
return tmp;
@@ -766,7 +608,8 @@
std::string s = op->describe (pl->ob);
packet sl ("ex");
- sl << ber32 (tag) << s.c_str ();
+ sl << ber32 (tag)
+ << data (*pl->expand_cfpod (s.c_str ()));
pl->ns->send_packet (sl);
}
@@ -786,15 +629,9 @@
return;
}
- object *op = esrv_get_ob_from_count (pl->ob, tag);
-
- if (!op)
- {
- LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
- return;
- }
-
- player_apply (pl->ob, op, 0, 0);
+ // the object might be legally gone already
+ if (object *op = esrv_get_ob_from_count (pl->ob, tag))
+ pl->ob->apply (op, AP_TOGGLE);
}
/** Client wants to lock some object. Lets do so. */
@@ -812,9 +649,9 @@
}
if (!flag)
- CLEAR_FLAG (op, FLAG_INV_LOCKED);
+ op->clr_flag (FLAG_INV_LOCKED);
else
- SET_FLAG (op, FLAG_INV_LOCKED);
+ op->set_flag (FLAG_INV_LOCKED);
esrv_update_item (UPD_FLAGS, pl->ob, op);
}
@@ -845,41 +682,70 @@
static void
look_at (player *pl, int dx, int dy)
{
- dynbuf_text buf;
+ dynbuf_text &buf = msg_dynbuf; buf.clear ();
object *ob = pl->ob;
if (!pl->observe->map)
return;
+ bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
+
mapxy pos (pl->observe);
pos.move (dx, dy);
- if (pos.normalise ())
- for (object *tmp = pos->top; tmp; tmp = tmp->below)
- {
- if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
- continue;
+ if (wiz)
+ {
+ if (pos.normalise ())
+ {
+ mapspace &ms = *pos;
+ ms.update ();
- 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, " ");
+ buf.printf (" map: %s%+d%+d (%+d%+d)\n"
+ " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
+ &pos.m->path, pos.x, pos.y, dx, dy,
+ (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
+ ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
+ );
+ }
+ else
+ buf << "off-map\n\n";
+ }
- if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
- break;
- }
+ int darkness = pl->blocked_los (dx, dy);
- if (buf.empty ())
- pl->failmsg ("You see nothing there.");
+ if (darkness == LOS_BLOCKED)
+ buf << "You cannot see that place from your position. H";
+ else if (darkness == LOS_MAX)
+ buf << "That place is too dark to see anything. H";
else
- pl->infobox (MSG_CHANNEL ("lookat"), buf);
+ {
+ if (pos.normalise ())
+ for (object *tmp = pos->top; tmp; tmp = tmp->below)
+ {
+ if (tmp->invisible && !ob->flag [FLAG_WIZ])
+ continue;
+
+ if (wiz)
+ buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
+ else
+ buf.printf (" - %s.\n", query_name (tmp));
+
+ object *head = tmp->head_ ();
+
+ if (head->inv)
+ if ((head->type != CONTAINER && head->type != FLESH)
+ || ob->flag [FLAG_WIZ])
+ buf << head->query_inventory (ob, " ");
+
+ if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
+ break;
+ }
+ }
+
+ if (buf.empty ())
+ buf << "You see nothing there.";
+
+ pl->infobox (MSG_CHANNEL ("lookat"), buf);
}
/** Client wants to look at some object. Lets do so. */
@@ -894,16 +760,6 @@
int dy = atoi (cp);
- if (player *opl = pl->observe->contr)
- if (client *ns = opl->ns)
- {
- if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
- return;
-
- if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
- return;
- }
-
look_at (pl, dx, dy);
}
@@ -911,9 +767,7 @@
void
esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
{
- object *op, *env;
-
- op = esrv_get_ob_from_count (pl, tag);
+ object *op = esrv_get_ob_from_count (pl, tag);
if (!op)
{
LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
@@ -928,18 +782,14 @@
/* If it is an active container, then we should drop all objects
* in the container and not the container itself.
*/
- if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
+ if (op->inv && op->flag [FLAG_APPLIED])
{
- int cnt = MAX_ITEM_PER_DROP;
+ int cnt = MAX_ITEM_PER_ACTION;
- for (object *current = op->inv; current; )
+ for (object *current = op->inv; current && cnt--; )
{
object *next = current->below;
-
drop_object (pl, current, 0);
-
- if (--cnt <= 0) break;
-
current = next;
}
@@ -962,7 +812,7 @@
return;
}
- env = esrv_get_ob_from_count (pl, to);
+ object *env = esrv_get_ob_from_count (pl, to);
if (!env)
{
LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);