--- deliantra/server/socket/item.C 2007/03/14 00:04:59 1.42 +++ deliantra/server/socket/item.C 2007/06/05 13:05:03 1.47 @@ -1,25 +1,25 @@ /* - * 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 + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen + * + * Crossfire TRT 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to */ /** @@ -267,6 +267,7 @@ flags |= F_NOPICK; ns.send_face (head->face); + ns.flush_fx (); if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) ns.send_animation (head->animation_id); @@ -332,39 +333,42 @@ * because object ordering would otherwise be inconsistent. */ void -esrv_draw_look (object *pl) +esrv_draw_look (player *pl) { int got_one = 0, start_look = 0, end_look = 0; - if (!pl->contr->ns->update_look) + object *ob = pl->ob; + + if (!pl->ns->update_look) { - LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); + LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); return; } else - pl->contr->ns->update_look = 0; + pl->ns->update_look = 0; - if (QUERY_FLAG (pl, FLAG_REMOVED) - || !pl->map - || pl->map->in_memory != MAP_IN_MEMORY - || out_of_map (pl->map, pl->x, pl->y)) + if (QUERY_FLAG (ob, FLAG_REMOVED) + || !ob->map + || ob->map->in_memory != MAP_IN_MEMORY + || out_of_map (ob->map, ob->x, ob->y)) return; - pl->contr->ns->send_packet ("delinv 0"); + pl->ns->send_packet ("delinv 0"); packet sl; - sl.printf ("item%d ", pl->contr->ns->itemcmd); + sl.printf ("item%d ", pl->ns->itemcmd); sl << uint32 (0); - pl->contr->ns->send_face (empty_face); + pl->ns->send_face (empty_face); + pl->ns->flush_fx (); - if (pl->contr->ns->look_position) + if (pl->ns->look_position) { 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)) + sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) << uint32 (0) << sint32 (-1) << uint32 (empty_face) @@ -373,11 +377,11 @@ << uint8 (0) << uint32 (0); - if (pl->contr->ns->itemcmd == 2) + if (pl->ns->itemcmd == 2) sl << uint16 (0); } - object *tmp = pl->ms ().top; + object *tmp = ob->ms ().top; for (object *last = 0; tmp != last; tmp = tmp->below) { object *head; @@ -391,7 +395,7 @@ if (tmp->client_visible ()) { - if (++start_look < pl->contr->ns->look_position) + if (++start_look < pl->ns->look_position) continue; end_look++; @@ -401,7 +405,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->ns->look_position + FLOORBOX_PAGESIZE)) + sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE)) << uint32 (0) << uint32 ((uint32) - 1) << uint32 (empty_face) @@ -410,7 +414,7 @@ << uint8 (0) << uint32 (0); - if (pl->contr->ns->itemcmd == 2) + if (pl->ns->itemcmd == 2) sl << uint16 (0); break; @@ -421,15 +425,15 @@ else head = tmp; - add_object_to_socklist (*pl->contr->ns, sl, head); + add_object_to_socklist (*pl->ns, sl, head); got_one++; if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) { - pl->contr->ns->send_packet (sl); + pl->ns->send_packet (sl); sl.reset (); - sl.printf ("item%d ", pl->contr->ns->itemcmd); + sl.printf ("item%d ", pl->ns->itemcmd); sl << uint32 (0); got_one = 0; } @@ -437,7 +441,7 @@ } if (got_one) - pl->contr->ns->send_packet (sl); + pl->ns->send_packet (sl); } @@ -556,6 +560,7 @@ if (flags & UPD_FACE) { ns->send_face (op->face); + ns->flush_fx (); sl << uint32 (op->face); } @@ -690,47 +695,45 @@ * 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) + 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; +#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 ExamineCmd (char *buf, int len, player *pl) { 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) @@ -742,6 +745,23 @@ examine (pl->ob, op); } +/** 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) @@ -818,62 +838,57 @@ * [ removed EARTHWALL check and added check for containers inventory. * Tero.Haatanen@lut.fi ] */ -void -look_at (object *op, int dx, int dy) +static void +look_at (player *pl, int dx, int dy) { - object *tmp; - int flag = 0; - sint16 x, y; - maptile *m; + object *ob = pl->ob; - x = op->x + dx; - y = op->y + dy; + maptile *m = pl->observe->map; + sint16 x = pl->observe->x + dx; + sint16 y = pl->observe->y + dy; - if (out_of_map (op->map, x, y)) - return; - - m = get_map_from_coord (op->map, &x, &y); - if (!m) - return; + if (!xy_normalise (m, x, y)) + { + new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there."); + return; + } - for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); + int flag = 0; - for (; tmp != NULL; tmp = tmp->below) + for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below) { - if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) + if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) continue; if (!flag) { if (dx || dy) - new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); + new_draw_info (NDI_UNIQUE, 0, ob, "There you see:"); else - { - clear_win_info (op); - new_draw_info (NDI_UNIQUE, 0, op, "You see:"); - } + new_draw_info (NDI_UNIQUE, 0, ob, "You see:"); + flag = 1; } - if (QUERY_FLAG (op, FLAG_WIZ)) - new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); + if (QUERY_FLAG (ob, FLAG_WIZ)) + new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count); else - new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); + new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && - (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) - inventory (op, tmp->head == NULL ? tmp : tmp->head); + (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ)) + inventory (ob, tmp->head == NULL ? tmp : tmp->head); - if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ + if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ break; } if (!flag) { if (dx || dy) - new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); + new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there."); else - new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); + new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); } } @@ -886,18 +901,16 @@ dx = atoi (buf); if (!(cp = strchr (buf, ' '))) - { - return; - } - dy = atoi (cp); + return; + dy = atoi (cp); if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) return; if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) return; - look_at (pl->ob, dx, dy); + look_at (pl, dx, dy); } /** Move an object to a new location */