ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.47 by root, Tue Jun 5 13:05:03 2007 UTC vs.
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
… …
264 263
265 flags = query_flags (head); 264 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 265 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 266 flags |= F_NOPICK;
268 267
269 ns.send_face (head->face); 268 ns.send_face (head->face, -50);
270 ns.flush_fx (); 269 ns.flush_fx ();
271 270
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 ns.send_animation (head->animation_id); 272 ns.send_animation (head->animation_id);
274 273
… …
358 packet sl; 357 packet sl;
359 sl.printf ("item%d ", pl->ns->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
360 359
361 sl << uint32 (0); 360 sl << uint32 (0);
362 361
363 pl->ns->send_face (empty_face); 362 pl->ns->send_face (empty_face, -50);
364 pl->ns->flush_fx (); 363 pl->ns->flush_fx ();
365 364
366 if (pl->ns->look_position) 365 if (pl->ns->look_position)
367 { 366 {
368 char buf[80]; 367 char buf[80];
… …
557 ns->last_weight = weight; 556 ns->last_weight = weight;
558 } 557 }
559 558
560 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
561 { 560 {
562 ns->send_face (op->face); 561 ns->send_face (op->face, -50);
563 ns->flush_fx (); 562 ns->flush_fx ();
564 sl << uint32 (op->face); 563 sl << uint32 (op->face);
565 } 564 }
566 565
567 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
… …
845 844
846 maptile *m = pl->observe->map; 845 maptile *m = pl->observe->map;
847 sint16 x = pl->observe->x + dx; 846 sint16 x = pl->observe->x + dx;
848 sint16 y = pl->observe->y + dy; 847 sint16 y = pl->observe->y + dy;
849 848
849 if (!m)
850 return;
851
850 if (!xy_normalise (m, x, y)) 852 if (!xy_normalise (m, x, y))
851 { 853 {
852 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there."); 854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
853 return; 855 return;
854 } 856 }
… …
894 896
895/** Client wants to look at some object. Lets do so. */ 897/** Client wants to look at some object. Lets do so. */
896void 898void
897LookAt (char *buf, int len, player *pl) 899LookAt (char *buf, int len, player *pl)
898{ 900{
899 int dx, dy;
900 char *cp; 901 char *cp;
901 902
902 dx = atoi (buf); 903 int dx = atoi (buf);
903 if (!(cp = strchr (buf, ' '))) 904 if (!(cp = strchr (buf, ' ')))
904 return; 905 return;
905 906
906 dy = atoi (cp); 907 int dy = atoi (cp);
908
909 if (player *opl = pl->observe->contr)
910 if (client *ns = opl->ns)
911 {
907 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 912 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
908 return; 913 return;
909 914
910 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 915 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
911 return; 916 return;
917 }
912 918
913 look_at (pl, dx, dy); 919 look_at (pl, dx, dy);
914} 920}
915 921
916/** Move an object to a new location */ 922/** Move an object to a new location */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines