--- deliantra/server/socket/item.C 2008/05/06 16:32:34 1.65 +++ deliantra/server/socket/item.C 2009/01/12 03:40:21 1.77 @@ -39,146 +39,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. @@ -306,8 +166,6 @@ if (ns.itemcmd == 2) sl << uint16 (head->client_type); - - SET_FLAG (head, FLAG_CLIENT_SENT); } static faceidx @@ -527,15 +385,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); @@ -552,9 +401,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); @@ -571,26 +420,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); } @@ -653,7 +496,6 @@ add_object_to_socklist (*pl->contr->ns, sl, op); pl->contr->ns->send_packet (sl); - SET_FLAG (op, FLAG_CLIENT_SENT); } /** @@ -752,7 +594,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); } @@ -837,35 +680,64 @@ 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; 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, (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 && !QUERY_FLAG (ob, FLAG_WIZ)) + continue; + + if (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) && !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. */ @@ -880,16 +752,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); } @@ -897,9 +759,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); @@ -918,14 +778,10 @@ { int cnt = MAX_ITEM_PER_DROP; - 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; } @@ -948,7 +804,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);