--- deliantra/server/socket/item.C 2006/12/14 00:13:26 1.13 +++ deliantra/server/socket/item.C 2007/04/23 19:10:17 1.44 @@ -1,25 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program 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 2 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, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The author can be reached via e-mail to -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program 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 2 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, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The author can be reached via e-mail to + */ /** * \file @@ -27,21 +28,158 @@ * * \date 2003-12-02 * - * This containes item logic for client/server. It doesn't contain + * This contains item logic for client/server. It doesn't contain * the actual commands that send the data, but does contain * the logic for what items should be sent. */ - #include -#include /* LOOK_OBJ */ -#include -#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 +187,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 +199,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 +240,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 +251,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 +266,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); + ns.send_face (head->face); + ns.flush_fx (); if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) - esrv_send_animation (&ns, head->animation_id); + ns.send_animation (head->animation_id); sl << uint32 (head->count) << uint32 (flags) << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) - << uint32 (head->face->number); + << uint32 (head->face); if (!head->custom_name) { @@ -187,12 +306,12 @@ anim_speed = head->anim_speed; else { - if (FABS (head->speed) < 0.001) + if (fabs (head->speed) < 0.001) anim_speed = 255; - else if (FABS (head->speed) >= 1.0) + else if (fabs (head->speed) >= 1.0) anim_speed = 1; else - anim_speed = (int) (1.0 / FABS (head->speed)); + anim_speed = (int) (1.0 / fabs (head->speed)); } if (anim_speed > 255) @@ -208,27 +327,23 @@ 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; - char buf[MAX_BUF]; - if (!pl->contr->socket.update_look) + if (!pl->contr->ns->update_look) { - LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); + LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); return; } else - pl->contr->socket.update_look = 0; + pl->contr->ns->update_look = 0; if (QUERY_FLAG (pl, FLAG_REMOVED) || !pl->map @@ -236,37 +351,36 @@ || 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); - - SockList sl (MAXSOCKBUF); - - Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1); + pl->contr->ns->send_packet ("delinv 0"); - sl.printf ("item%d ", pl->contr->socket.itemcmd); + packet sl; + sl.printf ("item%d ", pl->contr->ns->itemcmd); 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); + pl->contr->ns->send_face (empty_face); + pl->contr->ns->flush_fx (); - if (pl->contr->socket.look_position) + if (pl->contr->ns->look_position) { - sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) + char buf[80]; + snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); + + sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) << uint32 (0) << sint32 (-1) - << uint32 (empty_face->number); - - sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS); - - sl << uint16 (0) + << uint32 (empty_face) + << data8 (buf) + << uint16 (0) << uint8 (0) << uint32 (0); - if (pl->contr->socket.itemcmd == 2) + if (pl->contr->ns->itemcmd == 2) sl << uint16 (0); } - for (last = NULL; tmp != last; tmp = tmp->below) + object *tmp = pl->ms ().top; + for (object *last = 0; tmp != last; tmp = tmp->below) { object *head; @@ -277,54 +391,56 @@ last = last->below; } - if (LOOK_OBJ (tmp)) + if (tmp->client_visible ()) { - if (++start_look < pl->contr->socket.look_position) + if (++start_look < pl->contr->ns->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->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->contr->ns->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->ns, 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->ns->send_packet (sl); + + sl.reset (); + sl.printf ("item%d ", pl->contr->ns->itemcmd); + sl << uint32 (0); got_one = 0; } - } /* If LOOK_OBJ() */ + } } if (got_one) - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->ns->send_packet (sl); - sl.free (); } /** @@ -333,22 +449,19 @@ void esrv_send_inventory (object *pl, object *op) { - object *tmp; - int got_one = 0; - SockList sl; + if (!pl->contr->ns)//D + return; - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); + int got_one = 0; - sprintf ((char *) sl.buf, "delinv %d", op->count); - sl.len = strlen ((char *) sl.buf); - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->ns->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->ns->itemcmd); - SockList_AddInt (&sl, op->count); + sl << uint32 (op->count); - for (tmp = op->inv; tmp; tmp = tmp->below) + for (object *tmp = op->inv; tmp; tmp = tmp->below) { object *head; @@ -357,9 +470,9 @@ else head = tmp; - if (LOOK_OBJ (head)) + if (head->client_visible ()) { - add_object_to_socklist (pl->contr->socket, sl, head); + add_object_to_socklist (*pl->contr->ns, sl, head); got_one++; @@ -367,19 +480,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->ns->send_packet (sl); + + sl.reset (); + sl.printf ("item%d ", pl->contr->ns->itemcmd); + sl << uint32 (op->count); got_one = 0; } - } /* If LOOK_OBJ() */ + } } + if (got_one) - Send_With_Handling (&pl->contr->socket, &sl); - sl.free (); + pl->contr->ns->send_packet (sl); } /** @@ -389,16 +503,13 @@ * to the client (as defined in newclient.h - might as well use the * same value both places. */ - 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) { - if (!LOOK_OBJ (op)) + 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 @@ -406,6 +517,10 @@ */ } + 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 @@ -415,40 +530,36 @@ 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; - } + ns->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); + ns->send_face (op->face); + ns->flush_fx (); + sl << uint32 (op->face); } if (flags & UPD_NAME) @@ -475,13 +586,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) { @@ -493,23 +603,25 @@ anim_speed = op->anim_speed; else { - if (FABS (op->speed) < 0.001) + if (fabs (op->speed) < 0.001) anim_speed = 255; - else if (FABS (op->speed) >= 1.0) + else if (fabs (op->speed) >= 1.0) anim_speed = 1; else - anim_speed = (int) (1.0 / FABS (op->speed)); + 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); - sl.free (); + pl->contr->ns->send_packet (sl); } /** @@ -518,60 +630,56 @@ void esrv_send_item (object *pl, object *op) { - SockList sl; + 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 (!LOOK_OBJ (op)) + 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->socket.update_look = 1; + pl->contr->ns->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->ns->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->ns, sl, op); - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->ns->send_packet (sl); SET_FLAG (op, FLAG_CLIENT_SENT); - - sl.free (); } /** * Tells the client to delete an item. Uses the item * command with a -1 location. */ - void esrv_del_item (player *pl, int tag) { - SockList sl; + if (!pl->ns) + return; - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); + packet sl ("delitem"); - strcpy ((char *) sl.buf, "delitem "); - sl.len = strlen ((char *) sl.buf); - SockList_AddInt (&sl, tag); + sl << uint32 (tag); - Send_With_Handling (&pl->socket, &sl); - sl.free (); + pl->ns->send_packet (sl); } @@ -585,36 +693,38 @@ * Takes a player and object count (tag) and returns the actual object * pointer, or null if it can't be found. */ - object * esrv_get_ob_from_count (object *pl, tag_t count) { - object *op, *tmp; - if (pl->count == count) return pl; - for (op = pl->inv; op; op = op->below) + for (object *op = pl->inv; op; op = op->below) if (op->count == count) return op; else if (op->type == CONTAINER && pl->container == op) - for (tmp = op->inv; tmp; tmp = tmp->below) + for (object *tmp = op->inv; tmp; tmp = tmp->below) 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 (object *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; else if (op->type == CONTAINER && pl->container == op) - for (tmp = op->inv; tmp; tmp = tmp->below) + for (object *tmp = op->inv; tmp; tmp = tmp->below) if (tmp->count == count) return tmp; - return NULL; -} +#if 0 + /* If the high bit is set, player examined a pseudo object. */ + if (count & 0x80000000) + return 0; +#endif + return 0; +} /** Client wants to examine some object. So lets do so. */ void @@ -622,10 +732,6 @@ { 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) @@ -637,7 +743,24 @@ examine (pl->ob, op); } -/** Client wants to apply some object. Lets do so. */ +/** Client wants to examine some object. So lets do so. */ +void +ExCmd (char *buf, int len, player *pl) +{ + tag_t tag = atoi (buf); + + if (object *op = esrv_get_ob_from_count (pl->ob, tag)) + { + std::string s = op->describe (pl->ob); + + packet sl ("ex"); + sl << ber32 (tag) << s.c_str (); + + pl->ns->send_packet (sl); + } +} + +/** Client wants to apply some object. Lets do so. */ void ApplyCmd (char *buf, int len, player *pl) { @@ -652,8 +775,8 @@ /* 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->ns->look_position = tag & 0x7fffffff; + pl->ns->floorbox_update (); return; } @@ -668,12 +791,12 @@ 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 = data[0]; - tag_t tag = net_uint32 (data + 1); + tag_t tag = net_uint32 ((uint8 *)data + 1); object *op = esrv_get_ob_from_count (pl->ob, tag); if (!op) @@ -690,11 +813,11 @@ 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) { - tag_t tag = net_uint32 (data); + tag_t tag = net_uint32 ((uint8 *)data); object *op = esrv_get_ob_from_count (pl->ob, tag); if (!op) @@ -731,9 +854,10 @@ 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 && tmp->above; tmp = tmp->above) + ; - for (; tmp != NULL; tmp = tmp->below) + for (; tmp; tmp = tmp->below) { if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) continue; @@ -772,8 +896,6 @@ } } - - /** Client wants to look at some object. Lets do so. */ void LookAt (char *buf, int len, player *pl) @@ -783,15 +905,13 @@ dx = atoi (buf); if (!(cp = strchr (buf, ' '))) - { - return; - } - dy = atoi (cp); + return; - if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) + dy = atoi (cp); + if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) return; - if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) + if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) return; look_at (pl->ob, dx, dy); @@ -812,15 +932,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. */ @@ -833,12 +947,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) @@ -851,19 +965,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); } +