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.46 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.53 by root, Sun Sep 30 20:22:25 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];
… …
426 head = tmp; 425 head = tmp;
427 426
428 add_object_to_socklist (*pl->ns, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
429 got_one++; 428 got_one++;
430 429
431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
432 { 431 {
433 pl->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
434 433
435 sl.reset (); 434 sl.reset ();
436 sl.printf ("item%d ", pl->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
… …
480 479
481 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
482 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
483 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
484 */ 483 */
485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
486 { 485 {
487 pl->contr->ns->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
488 487
489 sl.reset (); 488 sl.reset ();
490 sl.printf ("item%d ", pl->contr->ns->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
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)
… …
836 * look_at prints items on the specified square. 835 * look_at prints items on the specified square.
837 * 836 *
838 * [ removed EARTHWALL check and added check for containers inventory. 837 * [ removed EARTHWALL check and added check for containers inventory.
839 * Tero.Haatanen@lut.fi ] 838 * Tero.Haatanen@lut.fi ]
840 */ 839 */
841void 840static void
842look_at (object *op, int dx, int dy) 841look_at (player *pl, int dx, int dy)
843{ 842{
844 object *tmp; 843 dynbuf_text buf;
845 int flag = 0; 844 object *ob = pl->ob;
846 sint16 x, y;
847 maptile *m;
848 845
849 x = op->x + dx; 846 mapxy pos (pl->observe);
850 y = op->y + dy; 847 pos.move (dx, dy);
851 848
852 if (out_of_map (op->map, x, y)) 849 if (pos.normalise ())
853 return; 850 for (object *tmp = pos->top; tmp; tmp = tmp->below)
854
855 m = get_map_from_coord (op->map, &x, &y);
856 if (!m)
857 return;
858
859 for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)
860 ;
861
862 for (; tmp; tmp = tmp->below)
863 { 851 {
864 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 852 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
865 continue; 853 continue;
866 854
867 if (!flag)
868 {
869 if (dx || dy)
870 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
871 else
872 {
873 clear_win_info (op);
874 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
875 }
876 flag = 1;
877 }
878
879 if (QUERY_FLAG (op, FLAG_WIZ)) 855 if (QUERY_FLAG (ob, FLAG_WIZ))
880 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 856 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
881 else 857 else
882 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 858 buf.printf ("- %s.\n", query_name (tmp));
883 859
884 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 860 object *head = tmp->head_ ();
885 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
886 inventory (op, tmp->head == NULL ? tmp : tmp->head);
887 861
862 if (head->inv)
863 if ((head->type != CONTAINER && head->type != FLESH)
864 || QUERY_FLAG (ob, FLAG_WIZ))
865 buf << head->query_inventory (ob, " ");
866
888 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 867 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
889 break; 868 break;
890 } 869 }
891 870
892 if (!flag) 871 if (buf.empty ())
893 { 872 pl->failmsg ("You see nothing there.");
894 if (dx || dy)
895 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
896 else 873 else
897 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 874 pl->infobox (MSG_CHANNEL ("lookat"), buf);
898 }
899} 875}
900 876
901/** Client wants to look at some object. Lets do so. */ 877/** Client wants to look at some object. Lets do so. */
902void 878void
903LookAt (char *buf, int len, player *pl) 879LookAt (char *buf, int len, player *pl)
904{ 880{
905 int dx, dy;
906 char *cp; 881 char *cp;
907 882
908 dx = atoi (buf); 883 int dx = atoi (buf);
909 if (!(cp = strchr (buf, ' '))) 884 if (!(cp = strchr (buf, ' ')))
910 return; 885 return;
911 886
912 dy = atoi (cp); 887 int dy = atoi (cp);
888
889 if (player *opl = pl->observe->contr)
890 if (client *ns = opl->ns)
891 {
913 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 892 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
914 return; 893 return;
915 894
916 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 895 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
917 return; 896 return;
897 }
918 898
919 look_at (pl->ob, dx, dy); 899 look_at (pl, dx, dy);
920} 900}
921 901
922/** Move an object to a new location */ 902/** Move an object to a new location */
923void 903void
924esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 904esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

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