--- deliantra/server/socket/item.C 2008/05/05 22:03:22 1.64 +++ deliantra/server/socket/item.C 2008/07/14 23:47:06 1.69 @@ -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. @@ -255,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; @@ -274,6 +133,8 @@ << 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); @@ -296,24 +157,9 @@ 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); @@ -542,13 +388,11 @@ 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); - } + /* 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 | logBacktrace, "We have not sent item %s (%d)\n", &op->name, op->count); packet sl ("upditem"); @@ -765,6 +609,9 @@ { std::string s = op->describe (pl->ob); + if (msg_is_special (s.c_str (), false)) + cfperl_expand_cfpod (pl, s); + packet sl ("ex"); sl << ber32 (tag) << s.c_str (); @@ -911,9 +758,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); @@ -932,14 +777,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; } @@ -962,7 +803,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);