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.50 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.59 by root, Tue Apr 22 02:46:18 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client/server logic. 26 * Client/server logic.
… …
263 263
264 flags = query_flags (head); 264 flags = query_flags (head);
265 if (QUERY_FLAG (head, FLAG_NO_PICK)) 265 if (QUERY_FLAG (head, FLAG_NO_PICK))
266 flags |= F_NOPICK; 266 flags |= F_NOPICK;
267 267
268 ns.send_face (head->face); 268 ns.send_face (head->face, -50);
269 ns.flush_fx (); 269 ns.flush_fx ();
270 270
271 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])
272 ns.send_animation (head->animation_id); 272 ns.send_animation (head->animation_id);
273 273
… …
346 else 346 else
347 pl->ns->update_look = 0; 347 pl->ns->update_look = 0;
348 348
349 if (QUERY_FLAG (ob, FLAG_REMOVED) 349 if (QUERY_FLAG (ob, FLAG_REMOVED)
350 || !ob->map 350 || !ob->map
351 || ob->map->in_memory != MAP_IN_MEMORY 351 || ob->map->in_memory != MAP_ACTIVE
352 || out_of_map (ob->map, ob->x, ob->y)) 352 || out_of_map (ob->map, ob->x, ob->y))
353 return; 353 return;
354 354
355 pl->ns->send_packet ("delinv 0"); 355 pl->ns->send_packet ("delinv 0");
356 356
357 packet sl; 357 packet sl;
358 sl.printf ("item%d ", pl->ns->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
359 359
360 sl << uint32 (0); 360 sl << uint32 (0);
361 361
362 pl->ns->send_face (empty_face); 362 pl->ns->send_face (empty_face, -50);
363 pl->ns->flush_fx (); 363 pl->ns->flush_fx ();
364 364
365 if (pl->ns->look_position) 365 if (pl->ns->look_position)
366 { 366 {
367 char buf[80]; 367 char buf[80];
… …
425 head = tmp; 425 head = tmp;
426 426
427 add_object_to_socklist (*pl->ns, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
428 got_one++; 428 got_one++;
429 429
430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
431 { 431 {
432 pl->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
433 433
434 sl.reset (); 434 sl.reset ();
435 sl.printf ("item%d ", pl->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
… …
479 479
480 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
481 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
482 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
483 */ 483 */
484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
485 { 485 {
486 pl->contr->ns->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
487 487
488 sl.reset (); 488 sl.reset ();
489 sl.printf ("item%d ", pl->contr->ns->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
556 ns->last_weight = weight; 556 ns->last_weight = weight;
557 } 557 }
558 558
559 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
560 { 560 {
561 ns->send_face (op->face); 561 ns->send_face (op->face, -50);
562 ns->flush_fx (); 562 ns->flush_fx ();
563 sl << uint32 (op->face); 563 sl << uint32 (op->face);
564 } 564 }
565 565
566 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
… …
665 pl->contr->ns->send_packet (sl); 665 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT); 666 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 667}
668 668
669/** 669/**
670 * Tells the client to delete an item. Uses the item 670 * Tells the client to delete an item.
671 * command with a -1 location.
672 */ 671 */
673void 672void
674esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
675{ 674{
676 if (!pl->ns) 675 if (!pl->ns)
… …
800 tag_t tag = net_uint32 ((uint8 *)data + 1); 799 tag_t tag = net_uint32 ((uint8 *)data + 1);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 800 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 801
803 if (!op) 802 if (!op)
804 { 803 {
805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 804 pl->failmsg ("Could not find object to lock/unlock");
806 return; 805 return;
807 } 806 }
808 807
809 if (!flag) 808 if (!flag)
810 CLEAR_FLAG (op, FLAG_INV_LOCKED); 809 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
821 tag_t tag = net_uint32 ((uint8 *)data); 820 tag_t tag = net_uint32 ((uint8 *)data);
822 object *op = esrv_get_ob_from_count (pl->ob, tag); 821 object *op = esrv_get_ob_from_count (pl->ob, tag);
823 822
824 if (!op) 823 if (!op)
825 { 824 {
826 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 825 pl->failmsg ("Could not find object to mark");
827 return; 826 return;
828 } 827 }
829 828
830 pl->mark = op; 829 pl->mark = op;
831 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 830 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
832} 831}
833 832
834/** 833/**
835 * look_at prints items on the specified square. 834 * look_at prints items on the specified square.
836 * 835 *
… …
838 * Tero.Haatanen@lut.fi ] 837 * Tero.Haatanen@lut.fi ]
839 */ 838 */
840static void 839static void
841look_at (player *pl, int dx, int dy) 840look_at (player *pl, int dx, int dy)
842{ 841{
842 dynbuf_text buf;
843 object *ob = pl->ob; 843 object *ob = pl->ob;
844 844
845 maptile *m = pl->observe->map; 845 if (!pl->observe->map)
846 sint16 x = pl->observe->x + dx;
847 sint16 y = pl->observe->y + dy;
848
849 if (!m)
850 return; 846 return;
851 847
852 if (!xy_normalise (m, x, y)) 848 mapxy pos (pl->observe);
853 { 849 pos.move (dx, dy);
854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
855 return;
856 }
857 850
858 int flag = 0; 851 if (pos.normalise ())
859
860 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below) 852 for (object *tmp = pos->top; tmp; tmp = tmp->below)
861 { 853 {
862 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 854 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
863 continue; 855 continue;
864 856
865 if (!flag)
866 {
867 if (dx || dy)
868 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
869 else
870 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
871
872 flag = 1;
873 }
874
875 if (QUERY_FLAG (ob, FLAG_WIZ)) 857 if (QUERY_FLAG (ob, FLAG_WIZ))
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count); 858 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
877 else 859 else
878 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); 860 buf.printf ("- %s.\n", query_name (tmp));
879 861
880 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 862 object *head = tmp->head_ ();
881 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
882 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
883 863
864 if (head->inv)
865 if ((head->type != CONTAINER && head->type != FLESH)
866 || QUERY_FLAG (ob, FLAG_WIZ))
867 buf << head->query_inventory (ob, " ");
868
884 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 869 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
885 break; 870 break;
886 } 871 }
887 872
888 if (!flag) 873 if (buf.empty ())
889 { 874 pl->failmsg ("You see nothing there.");
890 if (dx || dy)
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
892 else 875 else
893 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); 876 pl->infobox (MSG_CHANNEL ("lookat"), buf);
894 }
895} 877}
896 878
897/** Client wants to look at some object. Lets do so. */ 879/** Client wants to look at some object. Lets do so. */
898void 880void
899LookAt (char *buf, int len, player *pl) 881LookAt (char *buf, int len, player *pl)
… …
942 */ 924 */
943 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
944 { 926 {
945 object *current, *next; 927 object *current, *next;
946 928
929 int cnt = MAX_ITEM_PER_DROP;
930
947 for (current = op->inv; current != NULL; current = next) 931 for (current = op->inv; current != NULL; current = next)
948 { 932 {
949 next = current->below; 933 next = current->below;
950 drop_object (pl, current, 0); 934 drop_object (pl, current, 0);
935
936 if (--cnt <= 0) break;
951 } 937 }
938
939 if (cnt <= 0)
940 op->failmsg ("Only dropped some items, can't drop that many items at once.");
952 941
953 esrv_update_item (UPD_WEIGHT, pl, op); 942 esrv_update_item (UPD_WEIGHT, pl, op);
954 } 943 }
955 else 944 else
956 drop_object (pl, op, nrof); 945 drop_object (pl, op, nrof);
946
947 update_after_inventory_change (pl);
957 948
958 return; 949 return;
959 } 950 }
960 else if (to == pl->count) 951 else if (to == pl->count)
961 { /* pick it up to the inventory */ 952 { /* pick it up to the inventory */
… …
979 * has already been done (eg, it can be picked up and fits in 970 * has already been done (eg, it can be picked up and fits in
980 * in a sack, so check for those things. We should also check 971 * in a sack, so check for those things. We should also check
981 * an make sure env is in fact a container for that matter. 972 * an make sure env is in fact a container for that matter.
982 */ 973 */
983 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 974 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
975 {
984 put_object_in_sack (pl, env, op, nrof); 976 put_object_in_sack (pl, env, op, nrof);
977 update_after_inventory_change (pl);
978 }
985} 979}
986 980

Diff Legend

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