--- deliantra/server/socket/item.C 2007/11/26 11:41:02 1.56 +++ deliantra/server/socket/item.C 2009/04/27 01:38:49 1.78 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * @@ -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. @@ -195,39 +55,37 @@ unsigned int flags = 0; if (QUERY_FLAG (op, FLAG_APPLIED)) - { - switch (op->type) - { - case BOW: - case WAND: - case ROD: - case HORN: - flags = a_readied; - break; - case WEAPON: - flags = a_wielded; - break; - case SKILL: - case ARMOUR: - case HELMET: - case SHIELD: - case RING: - case BOOTS: - case GLOVES: - case AMULET: - case GIRDLE: - case BRACERS: - case CLOAK: - flags = a_worn; - break; - case CONTAINER: - flags = a_active; - break; - default: - flags = a_applied; - break; - } - } + switch (op->type) + { + case BOW: + case WAND: + case ROD: + case HORN: + flags = a_readied; + break; + case WEAPON: + flags = a_wielded; + break; + case SKILL: + case ARMOUR: + case HELMET: + case SHIELD: + case RING: + case BOOTS: + case GLOVES: + case AMULET: + case GIRDLE: + case BRACERS: + case CLOAK: + flags = a_worn; + break; + case CONTAINER: + flags = a_active; + break; + default: + flags = a_applied; + break; + } if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) flags |= F_OPEN; @@ -257,11 +115,10 @@ 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; - flags = query_flags (head); + int flags = query_flags (head); if (QUERY_FLAG (head, FLAG_NO_PICK)) flags |= F_NOPICK; @@ -273,9 +130,11 @@ 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); + int len; + if (!head->custom_name) { strncpy (item_n, query_base_name (head, 0), 127); @@ -298,34 +157,31 @@ sl << data8 (item_n, len) << 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 (fabs (head->speed), 1./255., 1./1.); sl << uint8 (anim_speed) << uint32 (head->nrof); if (ns.itemcmd == 2) sl << uint16 (head->client_type); +} + +static faceidx +need_face_now (player *pl, const char *name) +{ + faceidx face = face_find (name, empty_face); + + pl->ns->send_face (face, -50); + pl->ns->flush_fx (); - SET_FLAG (head, FLAG_CLIENT_SENT); + return face; } +#define FINGER_UP "finger_up.x11" +#define FINGER_DOWN "finger_down.x11" + /** * Send the look window. Don't need to do animations here * This sends all the faces to the client, not just updates. This is @@ -334,8 +190,6 @@ void esrv_draw_look (player *pl) { - int got_one = 0, start_look = 0, end_look = 0; - object *ob = pl->ob; if (!pl->ns->update_look) @@ -343,12 +197,12 @@ LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); return; } - else - pl->ns->update_look = 0; + + pl->ns->update_look = 0; 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; @@ -359,89 +213,105 @@ sl << uint32 (0); - pl->ns->send_face (empty_face, -50); - pl->ns->flush_fx (); + int start_pos = pl->ns->look_position; + bool dirty = false; + + mapspace &ms = ob->ms (); - if (pl->ns->look_position) + // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and + // start from the top + object *items [FLOORBOX_PAGESIZE]; + int item_idx = 0, item_cnt = 0; + int pos = 0; + + // find our items by walking down + object *item = ms.top; + + for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below) { - char buf[80]; - snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); + if (!item->client_visible ()) + continue; + + if (++pos < start_pos) + continue; + + // record item + items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0; + item_cnt++; + + // stop at first floor + if (item->flag [FLAG_IS_FLOOR]) + { + // we are finished, don't append "next group of items" + // by setting item to ms.bot it becomes zero which is checked after the while loop + item = ms.bot; + } + } - sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) + // see if there are more if we cared - we ignore invisible objects + if (item) + { + /* What we basically do is make a 'fake' object - when the user applies it, + * we notice the special tag the object has, and act accordingly. + */ + sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE)) << uint32 (0) - << sint32 (-1) - << uint32 (empty_face) - << data8 (buf) + << uint32 ((uint32) - 1) + << uint32 (need_face_now (pl, FINGER_DOWN)) + << data8 ("Apply this to see the items below") << uint16 (0) << uint8 (0) << uint32 (0); if (pl->ns->itemcmd == 2) sl << uint16 (0); + + dirty = true; } - object *tmp = ob->ms ().top; - for (object *last = 0; tmp != last; tmp = tmp->below) + // now send out all items in the ring buffer in reverse order + while (item_cnt) { - object *head; - - if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) - { - last = tmp->below; /* assumes double floor mode */ - if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) - last = last->below; - } - - if (tmp->client_visible ()) - { - if (++start_look < pl->ns->look_position) - continue; - - end_look++; - - if (end_look > FLOORBOX_PAGESIZE) - { - /* What we basically do is make a 'fake' object - when the user applies it, - * we notice the special tag the object has, and act accordingly. - */ - sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE)) - << uint32 (0) - << uint32 ((uint32) - 1) - << uint32 (empty_face) - << data8 ("Apply this to see next group of items") - << uint16 (0) - << uint8 (0) - << uint32 (0); - - if (pl->ns->itemcmd == 2) - sl << uint16 (0); + --item_cnt; + item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1; + object *item = items [item_idx]; - break; - } + add_object_to_socklist (*pl->ns, sl, item->head_ ()); - if (tmp->head) - head = tmp->head; - else - head = tmp; + dirty = true; - add_object_to_socklist (*pl->ns, sl, head); - got_one++; + // if packet got too large, send it and begin a new one + if (sl.length () > MAXSOCKBUF - MAXITEMLEN) + { + pl->ns->send_packet (sl); - if (sl.length () > MAXSOCKBUF - MAXITEMLEN) - { - pl->ns->send_packet (sl); + sl.reset (); + sl.printf ("item%d ", pl->ns->itemcmd); + sl << uint32 (0); - sl.reset (); - sl.printf ("item%d ", pl->ns->itemcmd); - sl << uint32 (0); - got_one = 0; - } + dirty = false; } } - if (got_one) - pl->ns->send_packet (sl); + if (start_pos) + { + sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE)) + << uint32 (0) + << sint32 (-1) + << uint32 (need_face_now (pl, FINGER_UP)) + << data8 ("Apply this to see the items higher up") + << uint16 (0) + << uint8 (0) + << uint32 (0); + + if (pl->ns->itemcmd == 2) + sl << uint16 (0); + dirty = true; + } + + if (dirty) + pl->ns->send_packet (sl); } /** @@ -508,35 +378,18 @@ 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) 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); - if (op->head) - op = op->head; + op = op->head_ (); sl << uint32 (op->count); @@ -548,12 +401,12 @@ if (flags & UPD_WEIGHT) { - sint32 weight = WEIGHT (op); + sint32 weight = op->client_weight (); - sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); - - if (pl == op) + if (op == pl) ns->last_weight = weight; + + sl << uint32 (weight); } if (flags & UPD_FACE) @@ -567,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); } @@ -634,41 +481,25 @@ if (!pl->contr->ns) return; - /* If this is not the player object, do some more checks */ - if (op != pl) - { - /* We only send 'visibile' objects to the client */ - if (!op->client_visible ()) - return; - - /* if the item is on the ground, mark that the look needs to - * be updated. - */ - if (!op->env) - { - pl->contr->ns->floorbox_update (); - return; - } - } + /* We only send 'visible' objects to the client, and sometimes the player */ + if (!op->client_visible () && op->type != PLAYER) + return; packet sl; sl.printf ("item%d ", pl->contr->ns->itemcmd); - if (op->head) - op = op->head; + op = op->head_ (); sl << uint32 (op->env ? op->env->count : 0); add_object_to_socklist (*pl->contr->ns, sl, op); pl->contr->ns->send_packet (sl); - SET_FLAG (op, FLAG_CLIENT_SENT); } /** - * 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) @@ -733,6 +564,14 @@ { tag_t tag = atoi (buf); + /* If the high bit is set, player applied a pseudo object. */ + if (tag & 0x80000000) + { + pl->ns->look_position = tag & 0x7fffffff; + pl->ns->floorbox_update (); + return; + } + object *op = esrv_get_ob_from_count (pl->ob, tag); if (!op) @@ -755,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); } @@ -767,12 +607,6 @@ { tag_t tag = atoi (buf); - /* sort of a hack, but if the player saves and the player then manually - * applies a savebed (or otherwise tries to do stuff), we run into trouble. - */ - if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) - return; - /* If the high bit is set, player applied a pseudo object. */ if (tag & 0x80000000) { @@ -802,7 +636,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 +657,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,41 +674,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; 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. */ @@ -889,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); } @@ -906,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); @@ -925,25 +776,17 @@ */ 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 && cnt--; ) { - next = current->below; + object *next = current->below; drop_object (pl, current, 0); - - if (--cnt <= 0) break; + current = next; } 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); + op->failmsg ("Only dropped some items, can't drop that many items at once."); } else drop_object (pl, op, nrof); @@ -961,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); @@ -973,7 +816,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); }