--- deliantra/server/socket/item.C 2007/03/14 00:04:59 1.42 +++ deliantra/server/socket/item.C 2008/04/24 00:30:52 1.63 @@ -1,25 +1,24 @@ /* - * 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 + * This file is part of Deliantra, the Roguelike Realtime MMORPG. + * + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen + * + * Deliantra 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 + * the Free Software Foundation, either version 3 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 + * 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 + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ /** @@ -196,39 +195,37 @@ unsigned int flags = 0; if (QUERY_FLAG (op, FLAG_APPLIED)) - { - 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; - } - } + 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; + } if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) flags |= F_OPEN; @@ -266,14 +263,15 @@ if (QUERY_FLAG (head, FLAG_NO_PICK)) flags |= F_NOPICK; - ns.send_face (head->face); + ns.send_face (head->face, -50); + ns.flush_fx (); if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[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 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) << uint32 (head->face); if (!head->custom_name) @@ -332,39 +330,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; - if (QUERY_FLAG (pl, FLAG_REMOVED) - || !pl->map - || pl->map->in_memory != MAP_IN_MEMORY - || out_of_map (pl->map, pl->x, pl->y)) + pl->ns->update_look = 0; + + if (QUERY_FLAG (ob, FLAG_REMOVED) + || !ob->map + || ob->map->in_memory != MAP_ACTIVE + || 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, -50); + 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,15 +374,13 @@ << 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; - if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) { last = tmp->below; /* assumes double floor mode */ @@ -391,7 +390,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 +400,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,26 +409,21 @@ << uint8 (0) << uint32 (0); - if (pl->contr->ns->itemcmd == 2) + if (pl->ns->itemcmd == 2) sl << uint16 (0); break; } - if (tmp->head) - head = tmp->head; - else - head = tmp; - - add_object_to_socklist (*pl->contr->ns, sl, head); + add_object_to_socklist (*pl->ns, sl, tmp->head_ ()); got_one++; - if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) + 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 +431,7 @@ } if (got_one) - pl->contr->ns->send_packet (sl); + pl->ns->send_packet (sl); } @@ -478,7 +472,7 @@ * items (especially with some of the bags out there) to * overflow the buffer. IF so, send multiple item commands. */ - if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) + if (sl.length () > MAXSOCKBUF - MAXITEMLEN) { pl->contr->ns->send_packet (sl); @@ -505,15 +499,8 @@ 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 (!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 - * order. - */ - } + if (op != pl && !op->client_visible ()) + return; client *ns = pl->contr->ns; if (!ns) @@ -532,8 +519,7 @@ sl << uint8 (flags); - if (op->head) - op = op->head; + op = op->head_ (); sl << uint32 (op->count); @@ -545,17 +531,18 @@ if (flags & UPD_WEIGHT) { - sint32 weight = WEIGHT (op); + sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); - sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); - - if (pl == op) + if (op) ns->last_weight = weight; + + sl << uint32 (weight); } if (flags & UPD_FACE) { - ns->send_face (op->face); + ns->send_face (op->face, -50); + ns->flush_fx (); sl << uint32 (op->face); } @@ -630,29 +617,15 @@ 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 (!op->client_visible ()) - return; - - /* if the item is on the ground, mark that the look needs to - * be updated. - */ - if (!op->env) - { - pl->contr->ns->floorbox_update (); - return; - } - } + /* We only send 'visible' objects to the client, and sometimes the player */ + if (!op->client_visible () && op->type != PLAYER) + return; packet sl; sl.printf ("item%d ", pl->contr->ns->itemcmd); - if (op->head) - op = op->head; + op = op->head_ (); sl << uint32 (op->env ? op->env->count : 0); @@ -663,8 +636,7 @@ } /** - * Tells the client to delete an item. Uses the item - * command with a -1 location. + * Tells the client to delete an item. */ void esrv_del_item (player *pl, int tag) @@ -690,47 +662,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 +712,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) @@ -783,7 +770,7 @@ if (!op) { - new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); + pl->failmsg ("Could not find object to lock/unlock"); return; } @@ -804,12 +791,12 @@ if (!op) { - new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); + pl->failmsg ("Could not find object to mark"); return; } pl->mark = op; - new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); + pl->ob->statusmsg (format ("Marked item %s", query_name (op))); } /** @@ -818,86 +805,69 @@ * [ 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; - - x = op->x + dx; - y = op->y + dy; + dynbuf_text buf; + object *ob = pl->ob; - if (out_of_map (op->map, x, y)) + if (!pl->observe->map) return; - m = get_map_from_coord (op->map, &x, &y); - if (!m) - return; + mapxy pos (pl->observe); + pos.move (dx, dy); - for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); + if (pos.normalise ()) + for (object *tmp = pos->top; tmp; tmp = tmp->below) + { + if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) + continue; - for (; tmp != NULL; tmp = tmp->below) - { - if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) - continue; + if (QUERY_FLAG (ob, FLAG_WIZ)) + buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); + else + buf.printf ("- %s.\n", query_name (tmp)); - if (!flag) - { - if (dx || dy) - new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); - else - { - clear_win_info (op); - new_draw_info (NDI_UNIQUE, 0, op, "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); - else - new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); + object *head = tmp->head_ (); - 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); + if (head->inv) + if ((head->type != CONTAINER && head->type != FLESH) + || QUERY_FLAG (ob, FLAG_WIZ)) + buf << head->query_inventory (ob, " "); - if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ - break; - } + 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."); - else - new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); - } + if (buf.empty ()) + pl->failmsg ("You see nothing there."); + else + pl->infobox (MSG_CHANNEL ("lookat"), buf); } /** Client wants to look at some object. Lets do so. */ void LookAt (char *buf, int len, player *pl) { - int dx, dy; char *cp; - dx = atoi (buf); + int dx = atoi (buf); if (!(cp = strchr (buf, ' '))) - { - 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; + int dy = atoi (cp); + + if (player *opl = pl->observe->contr) + if (client *ns = opl->ns) + { + if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2) + return; - look_at (pl->ob, dx, dy); + if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) + return; + } + + look_at (pl, dx, dy); } /** Move an object to a new location */ @@ -923,15 +893,21 @@ */ if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) { - object *current, *next; + int cnt = MAX_ITEM_PER_DROP; - for (current = op->inv; current != NULL; current = next) + for (object *current = op->inv; current; ) { - next = current->below; + object *next = current->below; + drop_object (pl, current, 0); + + if (--cnt <= 0) break; + + current = next; } - esrv_update_item (UPD_WEIGHT, pl, op); + if (cnt <= 0) + op->failmsg ("Only dropped some items, can't drop that many items at once."); } else drop_object (pl, op, nrof); @@ -961,7 +937,9 @@ * 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)) + if (env->type == CONTAINER + && can_pick (pl, op) + && sack_can_hold (pl, env, op, nrof)) put_object_in_sack (pl, env, op, nrof); }