--- deliantra/server/socket/item.C 2006/09/16 22:24:13 1.8 +++ deliantra/server/socket/item.C 2006/12/20 09:14:22 1.28 @@ -32,16 +32,153 @@ * the logic for what items should be sent. */ - #include #include /* LOOK_OBJ */ -#include -#include #include /** 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. @@ -49,29 +186,8 @@ ******************************************************************************/ /** - * Adds string to socklist. - * - * This is a simple function that we use a lot here. It basically - * adds the specified buffer into the socklist, but prepends a - * single byte in length. If the data is longer than that byte, it is - * truncated approprately. - */ -inline void -add_stringlen_to_sockbuf (const char *buf, SockList * sl) -{ - int len; - - len = strlen (buf); - if (len > 255) - len = 255; - SockList_AddChar (sl, (char) len); - strncpy ((char *) sl->buf + sl->len, buf, len); - sl->len += len; -} - -/** * This is a similar to query_name, but returns flags - * to be sended to client. + * to be sent to client. */ unsigned int query_flags (object *op) @@ -82,36 +198,37 @@ { 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; + 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; @@ -122,6 +239,7 @@ else if (QUERY_FLAG (op, FLAG_CURSED)) flags |= F_CURSED; } + if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) flags |= F_MAGIC; if (QUERY_FLAG (op, FLAG_UNPAID)) @@ -132,12 +250,12 @@ return flags; } -/* Used in the send_look to put object head into SockList +/* Used in the send_look to put object head into packet * sl for socket ns. Need socket to know if we need to send * animation of face to the client. */ static void -add_object_to_socklist (NewSocket * ns, SockList * sl, object *head) +add_object_to_socklist (client &ns, packet &sl, object *head) { int flags, len, anim_speed; char item_n[MAX_BUF]; @@ -147,16 +265,16 @@ if (QUERY_FLAG (head, FLAG_NO_PICK)) flags |= F_NOPICK; - if (!(ns->faces_sent[head->face->number] & NS_FACESENT_FACE)) - esrv_send_face (ns, head->face->number, 0); + if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) + esrv_send_face (&ns, head->face->number, 0); - if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns->anims_sent[head->animation_id]) - esrv_send_animation (ns, head->animation_id); + if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) + esrv_send_animation (&ns, head->animation_id); - SockList_AddInt (sl, head->count); - SockList_AddInt (sl, flags); - SockList_AddInt (sl, QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)); - SockList_AddInt (sl, head->face->number); + sl << uint32 (head->count) + << uint32 (flags) + << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) + << uint32 (head->face->number); if (!head->custom_name) { @@ -172,14 +290,14 @@ len = strlen (item_n); item_p = head->custom_name; } + strncpy (item_n + len + 1, item_p, 127); item_n[254] = 0; len += strlen (item_n + 1 + len) + 1; - SockList_AddChar (sl, (char) len); - memcpy (sl->buf + sl->len, item_n, len); - sl->len += len; - SockList_AddShort (sl, head->animation_id); + sl << data8 (item_n, len) + << uint16 (head->animation_id); + anim_speed = 0; if (QUERY_FLAG (head, FLAG_ANIMATE)) { @@ -194,72 +312,76 @@ else anim_speed = (int) (1.0 / FABS (head->speed)); } + if (anim_speed > 255) anim_speed = 255; } - SockList_AddChar (sl, (char) anim_speed); - SockList_AddInt (sl, head->nrof); - if (ns->itemcmd == 2) - SockList_AddShort (sl, head->client_type); + sl << uint8 (anim_speed) + << uint32 (head->nrof); + + if (ns.itemcmd == 2) + sl << uint16 (head->client_type); SET_FLAG (head, FLAG_CLIENT_SENT); } /** - * Send the look window. Don't need to do animations here - * This sends all the faces to the client, not just updates. This is - * because object ordering would otherwise be inconsistent + * Send the look window. Don't need to do animations here + * This sends all the faces to the client, not just updates. This is + * because object ordering would otherwise be inconsistent. */ - void esrv_draw_look (object *pl) { object *tmp, *last; int got_one = 0, start_look = 0, end_look = 0; - SockList sl; char buf[MAX_BUF]; - if (!pl->contr->socket.update_look) + if (!pl->contr->socket->update_look) { LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); return; } else - { - pl->contr->socket.update_look = 0; - } + pl->contr->socket->update_look = 0; - if (QUERY_FLAG (pl, FLAG_REMOVED) || pl->map == NULL || pl->map->in_memory != MAP_IN_MEMORY || out_of_map (pl->map, pl->x, pl->y)) + if (QUERY_FLAG (pl, FLAG_REMOVED) + || !pl->map + || pl->map->in_memory != MAP_IN_MEMORY + || out_of_map (pl->map, pl->x, pl->y)) return; - for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above); + for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) + ; + + pl->contr->socket->send_packet ("delinv 0"); - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); + packet sl; + sl.printf ("item%d ", pl->contr->socket->itemcmd); - Write_String_To_Socket (&pl->contr->socket, "delinv 0", strlen ("delinv 0")); - sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); - sl.len = strlen ((char *) sl.buf); - - SockList_AddInt (&sl, 0); - - if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) - esrv_send_face (&pl->contr->socket, empty_face->number, 0); - - if (pl->contr->socket.look_position) - { - SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)); - SockList_AddInt (&sl, 0); - SockList_AddInt (&sl, (uint32) - 1); - SockList_AddInt (&sl, empty_face->number); - sprintf (buf, "Click here to see %d previous items", NUM_LOOK_OBJECTS); - add_stringlen_to_sockbuf (buf, &sl); - SockList_AddShort (&sl, 0); - SockList_AddChar (&sl, 0); - SockList_AddInt (&sl, 0); - if (pl->contr->socket.itemcmd == 2) - SockList_AddShort (&sl, 0); + sl << uint32 (0); + + if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) + esrv_send_face (pl->contr->socket, empty_face->number, 0); + + if (pl->contr->socket->look_position) + { + char buf[80]; + snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); + + sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) + << uint32 (0) + << sint32 (-1) + << uint32 (empty_face->number) + << data8 (buf) + << uint16 (0) + << uint8 (0) + << uint32 (0); + + if (pl->contr->socket->itemcmd == 2) + sl << uint16 (0); } for (last = NULL; tmp != last; tmp = tmp->below) @@ -272,51 +394,57 @@ if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) last = last->below; } + if (LOOK_OBJ (tmp)) { - if (++start_look < pl->contr->socket.look_position) + if (++start_look < pl->contr->socket->look_position) continue; + end_look++; - if (end_look > NUM_LOOK_OBJECTS) + + 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. */ - SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)); - SockList_AddInt (&sl, 0); - SockList_AddInt (&sl, (uint32) - 1); - SockList_AddInt (&sl, empty_face->number); - sprintf (buf, "Click here to see next group of items"); - add_stringlen_to_sockbuf (buf, &sl); - SockList_AddShort (&sl, 0); - SockList_AddChar (&sl, 0); - SockList_AddInt (&sl, 0); - if (pl->contr->socket.itemcmd == 2) - SockList_AddShort (&sl, 0); + sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) + << uint32 (0) + << uint32 ((uint32) - 1) + << uint32 (empty_face->number) + << data8 ("Apply this to see next group of items") + << uint16 (0) + << uint8 (0) + << uint32 (0); + + if (pl->contr->socket->itemcmd == 2) + sl << uint16 (0); + break; } + if (tmp->head) head = tmp->head; else head = tmp; - add_object_to_socklist (&pl->contr->socket, &sl, head); + add_object_to_socklist (*pl->contr->socket, sl, head); got_one++; - if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) + if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) { - Send_With_Handling (&pl->contr->socket, &sl); - sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); - sl.len = strlen ((char *) sl.buf); - SockList_AddInt (&sl, 0); + pl->contr->socket->send_packet (sl); + + sl.reset (); + sl.printf ("item%d ", pl->contr->socket->itemcmd); + sl << uint32 (0); got_one = 0; } - } /* If LOOK_OBJ() */ + } } + if (got_one) - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->socket->send_packet (sl); - free (sl.buf); } /** @@ -327,18 +455,14 @@ { object *tmp; int got_one = 0; - SockList sl; - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - sprintf ((char *) sl.buf, "delinv %d", op->count); - sl.len = strlen ((char *) sl.buf); - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->socket->send_packet_printf ("delinv %d", op->count); - sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); - sl.len = strlen ((char *) sl.buf); + packet sl; + sl.printf ("item%d ", pl->contr->socket->itemcmd); - SockList_AddInt (&sl, op->count); + sl << uint32 (op->count); for (tmp = op->inv; tmp; tmp = tmp->below) { @@ -351,7 +475,7 @@ if (LOOK_OBJ (head)) { - add_object_to_socklist (&pl->contr->socket, &sl, head); + add_object_to_socklist (*pl->contr->socket, sl, head); got_one++; @@ -359,19 +483,20 @@ * items (especially with some of the bags out there) to * overflow the buffer. IF so, send multiple item commands. */ - if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) + if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) { - Send_With_Handling (&pl->contr->socket, &sl); - sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); - sl.len = strlen ((char *) sl.buf); - SockList_AddInt (&sl, op->count); + pl->contr->socket->send_packet (sl); + + sl.reset (); + sl.printf ("item%d ", pl->contr->socket->itemcmd); + sl << uint32 (op->count); got_one = 0; } } /* If LOOK_OBJ() */ } + if (got_one) - Send_With_Handling (&pl->contr->socket, &sl); - free (sl.buf); + pl->contr->socket->send_packet (sl); } /** @@ -385,8 +510,6 @@ void esrv_update_item (int flags, object *pl, object *op) { - SockList sl; - /* If we have a request to send the player item, skip a few checks. */ if (op != pl) { @@ -397,6 +520,7 @@ * order. */ } + if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) { /* FLAG_CLIENT_SENT is debug only. We are using it to see where @@ -405,41 +529,40 @@ */ LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); } - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "upditem "); - sl.len = strlen ((char *) sl.buf); + packet sl ("upditem"); - SockList_AddChar (&sl, (char) flags); + sl << uint8 (flags); if (op->head) op = op->head; - SockList_AddInt (&sl, op->count); + sl << uint32 (op->count); if (flags & UPD_LOCATION) - SockList_AddInt (&sl, op->env ? op->env->count : 0); + sl << uint32 (op->env ? op->env->count : 0); if (flags & UPD_FLAGS) - SockList_AddInt (&sl, query_flags (op)); + sl << uint32 (query_flags (op)); if (flags & UPD_WEIGHT) { sint32 weight = WEIGHT (op); - SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); + sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); + if (pl == op) - { - op->contr->last_weight = weight; - } + op->contr->last_weight = weight; } if (flags & UPD_FACE) { - if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) - esrv_send_face (&pl->contr->socket, op->face->number, 0); - SockList_AddInt (&sl, op->face->number); + if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) + esrv_send_face (pl->contr->socket, op->face->number, 0); + + sl << uint32 (op->face->number); } + if (flags & UPD_NAME) { int len; @@ -464,12 +587,12 @@ strncpy (item_n + len + 1, item_p, 127); item_n[254] = 0; len += strlen (item_n + 1 + len) + 1; - SockList_AddChar (&sl, (char) len); - memcpy (sl.buf + sl.len, item_n, len); - sl.len += len; + + sl << data8 (item_n, len); } + if (flags & UPD_ANIM) - SockList_AddShort (&sl, op->animation_id); + sl << uint16 (op->animation_id); if (flags & UPD_ANIMSPEED) { @@ -488,16 +611,18 @@ else anim_speed = (int) (1.0 / FABS (op->speed)); } + if (anim_speed > 255) anim_speed = 255; } - SockList_AddChar (&sl, (char) anim_speed); + + sl << uint8 (anim_speed); } + if (flags & UPD_NROF) - SockList_AddInt (&sl, op->nrof); + sl << uint32 (op->nrof); - Send_With_Handling (&pl->contr->socket, &sl); - free (sl.buf); + pl->contr->socket->send_packet (sl); } /** @@ -506,8 +631,6 @@ void esrv_send_item (object *pl, object *op) { - SockList sl; - /* If this is not the player object, do some more checks */ if (op != pl) { @@ -519,26 +642,24 @@ */ if (!op->env) { - pl->contr->socket.update_look = 1; + pl->contr->socket->floorbox_update (); return; } } - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); + packet sl; - sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); - sl.len = strlen ((char *) sl.buf); + sl.printf ("item%d ", pl->contr->socket->itemcmd); if (op->head) op = op->head; - SockList_AddInt (&sl, op->env ? op->env->count : 0); + sl << uint32 (op->env ? op->env->count : 0); - add_object_to_socklist (&pl->contr->socket, &sl, op); + add_object_to_socklist (*pl->contr->socket, sl, op); - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->socket->send_packet (sl); SET_FLAG (op, FLAG_CLIENT_SENT); - free (sl.buf); } /** @@ -549,16 +670,11 @@ void esrv_del_item (player *pl, int tag) { - SockList sl; + packet sl ("delitem"); - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); + sl << uint32 (tag); - strcpy ((char *) sl.buf, "delitem "); - sl.len = strlen ((char *) sl.buf); - SockList_AddInt (&sl, tag); - - Send_With_Handling (&pl->socket, &sl); - free (sl.buf); + pl->socket->send_packet (sl); } @@ -589,8 +705,8 @@ if (tmp->count == count) return tmp; - for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) - if (op->head != NULL && op->head->count == count) + for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) + if (op->head && op->head->count == count) return op; else if (op->count == count) return op; @@ -599,7 +715,7 @@ if (tmp->count == count) return tmp; - return NULL; + return 0; } @@ -607,7 +723,12 @@ void ExamineCmd (char *buf, int len, player *pl) { - long tag = atoi (buf); + tag_t tag = atoi (buf); + + /* If the high bit is set, player examined a pseudo object. */ + if (tag & 0x80000000) + return; + object *op = esrv_get_ob_from_count (pl->ob, tag); if (!op) @@ -615,15 +736,15 @@ LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); return; } + examine (pl->ob, op); } -/** Client wants to apply some object. Lets do so. */ +/** Client wants to apply some object. Lets do so. */ void ApplyCmd (char *buf, int len, player *pl) { - uint32 tag = atoi (buf); - object *op = esrv_get_ob_from_count (pl->ob, tag); + 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. @@ -634,62 +755,61 @@ /* If the high bit is set, player applied a pseudo object. */ if (tag & 0x80000000) { - pl->socket.look_position = tag & 0x7fffffff; - pl->socket.update_look = 1; + pl->socket->look_position = tag & 0x7fffffff; + pl->socket->floorbox_update (); 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); } -/** Client wants to apply some object. Lets do so. */ +/** Client wants to lock some object. Lets do so. */ void -LockItem (uint8 * data, int len, player *pl) +LockItem (char *data, int len, player *pl) { - int flag, tag; - object *op; - - flag = data[0]; - tag = GetInt_String (data + 1); - op = esrv_get_ob_from_count (pl->ob, tag); + int flag = data[0]; + tag_t tag = net_uint32 ((uint8 *)data + 1); + object *op = esrv_get_ob_from_count (pl->ob, tag); if (!op) { new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); return; } + if (!flag) CLEAR_FLAG (op, FLAG_INV_LOCKED); else SET_FLAG (op, FLAG_INV_LOCKED); + esrv_update_item (UPD_FLAGS, pl->ob, op); } -/** Client wants to apply some object. Lets do so. */ +/** Client wants to mark some object. Lets do so. */ void -MarkItem (uint8 * data, int len, player *pl) +MarkItem (char *data, int len, player *pl) { - int tag; - object *op; + tag_t tag = net_uint32 ((uint8 *)data); + object *op = esrv_get_ob_from_count (pl->ob, tag); - tag = GetInt_String (data); - op = esrv_get_ob_from_count (pl->ob, tag); if (!op) { new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); return; } + pl->mark = op; - pl->mark_count = op->count; new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); } - /** * look_at prints items on the specified square. * @@ -714,7 +834,7 @@ if (!m) return; - for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); + for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); for (; tmp != NULL; tmp = tmp->below) { @@ -771,10 +891,10 @@ } dy = atoi (cp); - if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) + if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) return; - if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) + if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) return; look_at (pl->ob, dx, dy); @@ -795,15 +915,9 @@ if (!to) { /* drop it to the ground */ - -/* LOG(llevDebug, "Drop it on the ground.\n");*/ - if (op->map && !op->env) - { + return; -/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/ - return; - } /* If it is an active container, then we should drop all objects * in the container and not the container itself. */ @@ -816,12 +930,12 @@ next = current->below; drop_object (pl, current, 0); } + esrv_update_item (UPD_WEIGHT, pl, op); } else - { - drop_object (pl, op, nrof); - } + drop_object (pl, op, nrof); + return; } else if (to == pl->count) @@ -834,19 +948,20 @@ pick_up (pl, op); return; } + 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); return; } + /* put_object_in_sack presumes that necessary sanity checking * has already been done (eg, it can be picked up and fits in * 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)) - { - put_object_in_sack (pl, env, op, nrof); - } + put_object_in_sack (pl, env, op, nrof); } +