--- deliantra/server/socket/item.C 2006/12/20 09:14:22 1.28 +++ deliantra/server/socket/item.C 2007/01/12 01:29:13 1.33 @@ -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,13 +28,13 @@ * * \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 */ @@ -326,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 @@ -335,17 +335,16 @@ 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"); return; } else - pl->contr->socket->update_look = 0; + pl->contr->ns->update_look = 0; if (QUERY_FLAG (pl, FLAG_REMOVED) || !pl->map @@ -353,25 +352,22 @@ || 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); + if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) + esrv_send_face (pl->contr->ns, empty_face->number, 0); - 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) @@ -380,11 +376,12 @@ << 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; @@ -395,9 +392,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++; @@ -407,7 +404,7 @@ /* 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) @@ -416,7 +413,7 @@ << uint8 (0) << uint32 (0); - if (pl->contr->socket->itemcmd == 2) + if (pl->contr->ns->itemcmd == 2) sl << uint16 (0); break; @@ -427,15 +424,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; } @@ -443,7 +440,7 @@ } if (got_one) - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); } @@ -453,18 +450,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; @@ -473,9 +471,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++; @@ -485,18 +483,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); } /** @@ -513,7 +511,7 @@ /* 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 @@ -521,6 +519,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 @@ -552,13 +554,13 @@ 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); + if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) + esrv_send_face (ns, op->face->number, 0); sl << uint32 (op->face->number); } @@ -622,7 +624,7 @@ if (flags & UPD_NROF) sl << uint32 (op->nrof); - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); } /** @@ -635,30 +637,31 @@ 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); } @@ -674,7 +677,7 @@ sl << uint32 (tag); - pl->socket->send_packet (sl); + pl->ns->send_packet (sl); } @@ -755,8 +758,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; } @@ -891,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);