--- deliantra/server/socket/item.C 2007/06/08 09:18:31 1.48 +++ deliantra/server/socket/item.C 2007/07/24 04:55:35 1.51 @@ -1,23 +1,22 @@ /* - * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. * * 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. + * 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 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 GNU General Public License - * for more details. + * 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 + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * * The authors can be reached via e-mail to */ @@ -266,7 +265,7 @@ 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]) @@ -360,7 +359,7 @@ sl << uint32 (0); - pl->ns->send_face (empty_face); + pl->ns->send_face (empty_face, -50); pl->ns->flush_fx (); if (pl->ns->look_position) @@ -559,7 +558,7 @@ if (flags & UPD_FACE) { - ns->send_face (op->face); + ns->send_face (op->face, -50); ns->flush_fx (); sl << uint32 (op->face); } @@ -847,6 +846,9 @@ sint16 x = pl->observe->x + dx; sint16 y = pl->observe->y + dy; + if (!m) + return; + if (!xy_normalise (m, x, y)) { new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");