--- deliantra/server/socket/item.C 2006/12/20 01:19:11 1.27 +++ deliantra/server/socket/item.C 2007/04/03 00:21:38 1.43 @@ -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,18 +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 /** 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. @@ -125,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) { @@ -165,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) @@ -186,7 +327,6 @@ 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 @@ -195,17 +335,15 @@ 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 @@ -213,38 +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) - ; - - pl->contr->socket->send_packet ("delinv 0"); + pl->contr->ns->send_packet ("delinv 0"); packet sl; - sl.printf ("item%d ", pl->contr->socket->itemcmd); + 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) { 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)) + sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) << uint32 (0) << sint32 (-1) - << uint32 (empty_face->number) + << 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; @@ -255,9 +391,9 @@ 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++; @@ -267,16 +403,16 @@ /* 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->contr->socket->look_position + FLOORBOX_PAGESIZE)) + sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) << uint32 (0) << uint32 ((uint32) - 1) - << uint32 (empty_face->number) + << uint32 (empty_face) << data8 ("Apply this to see next group of items") << uint16 (0) << uint8 (0) << uint32 (0); - if (pl->contr->socket->itemcmd == 2) + if (pl->contr->ns->itemcmd == 2) sl << uint16 (0); break; @@ -287,15 +423,15 @@ 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.length () >= (MAXSOCKBUF - MAXITEMLEN)) { - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); sl.reset (); - sl.printf ("item%d ", pl->contr->socket->itemcmd); + sl.printf ("item%d ", pl->contr->ns->itemcmd); sl << uint32 (0); got_one = 0; } @@ -303,7 +439,7 @@ } if (got_one) - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); } @@ -313,18 +449,19 @@ void esrv_send_inventory (object *pl, object *op) { - object *tmp; - int got_one = 0; + if (!pl->contr->ns)//D + return; + int got_one = 0; - pl->contr->socket->send_packet_printf ("delinv %d", op->count); + pl->contr->ns->send_packet_printf ("delinv %d", op->count); packet sl; - sl.printf ("item%d ", pl->contr->socket->itemcmd); + sl.printf ("item%d ", pl->contr->ns->itemcmd); sl << uint32 (op->count); - for (tmp = op->inv; tmp; tmp = tmp->below) + for (object *tmp = op->inv; tmp; tmp = tmp->below) { object *head; @@ -333,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++; @@ -345,18 +482,18 @@ */ if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) { - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); sl.reset (); - sl.printf ("item%d ", pl->contr->socket->itemcmd); + sl.printf ("item%d ", pl->contr->ns->itemcmd); sl << uint32 (op->count); got_one = 0; } - } /* If LOOK_OBJ() */ + } } if (got_one) - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); } /** @@ -366,14 +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) { /* 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 @@ -381,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 @@ -412,15 +552,14 @@ 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); - - sl << uint32 (op->face->number); + ns->send_face (op->face); + ns->flush_fx (); + sl << uint32 (op->face); } if (flags & UPD_NAME) @@ -464,12 +603,12 @@ 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) @@ -482,7 +621,7 @@ if (flags & UPD_NROF) sl << uint32 (op->nrof); - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); } /** @@ -491,34 +630,38 @@ void esrv_send_item (object *pl, object *op) { + 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->floorbox_update (); + pl->contr->ns->floorbox_update (); return; } } packet sl; - sl.printf ("item%d ", pl->contr->socket->itemcmd); + sl.printf ("item%d ", pl->contr->ns->itemcmd); if (op->head) op = op->head; 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); - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); SET_FLAG (op, FLAG_CLIENT_SENT); } @@ -526,15 +669,17 @@ * Tells the client to delete an item. Uses the item * command with a -1 location. */ - void esrv_del_item (player *pl, int tag) { + if (!pl->ns) + return; + packet sl ("delitem"); sl << uint32 (tag); - pl->socket->send_packet (sl); + pl->ns->send_packet (sl); } @@ -565,7 +710,7 @@ if (tmp->count == count) return tmp; - for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) + 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) @@ -615,8 +760,8 @@ /* If the high bit is set, player applied a pseudo object. */ if (tag & 0x80000000) { - pl->socket->look_position = tag & 0x7fffffff; - pl->socket->floorbox_update (); + pl->ns->look_position = tag & 0x7fffffff; + pl->ns->floorbox_update (); return; } @@ -694,7 +839,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) { @@ -735,8 +880,6 @@ } } - - /** Client wants to look at some object. Lets do so. */ void LookAt (char *buf, int len, player *pl) @@ -751,10 +894,10 @@ } dy = atoi (cp); - if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) + 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);