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.53 by root, Sun Sep 30 20:22:25 2007 UTC vs.
Revision 1.60 by root, Tue Apr 22 07:01:47 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.
… …
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
274 sl << uint32 (head->count) 274 sl << uint32 (head->count)
275 << uint32 (flags) 275 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277 << uint32 (head->face); 277 << uint32 (head->face);
278 278
279 if (!head->custom_name) 279 if (!head->custom_name)
280 { 280 {
281 strncpy (item_n, query_base_name (head, 0), 127); 281 strncpy (item_n, query_base_name (head, 0), 127);
… …
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
… …
546 if (flags & UPD_FLAGS) 546 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 547 sl << uint32 (query_flags (op));
548 548
549 if (flags & UPD_WEIGHT) 549 if (flags & UPD_WEIGHT)
550 { 550 {
551 sint32 weight = WEIGHT (op); 551 sint32 weight = op->client_weight ();
552 552
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554 554
555#if 0
555 if (pl == op) 556 if (pl == op)
556 ns->last_weight = weight; 557 ns->last_weight = weight;
558#endif
557 } 559 }
558 560
559 if (flags & UPD_FACE) 561 if (flags & UPD_FACE)
560 { 562 {
561 ns->send_face (op->face, -50); 563 ns->send_face (op->face, -50);
… …
635 return; 637 return;
636 638
637 /* If this is not the player object, do some more checks */ 639 /* If this is not the player object, do some more checks */
638 if (op != pl) 640 if (op != pl)
639 { 641 {
640 /* We only send 'visibile' objects to the client */ 642 /* We only send 'visible' objects to the client */
641 if (!op->client_visible ()) 643 if (!op->client_visible ())
642 return; 644 return;
643 645
644 /* if the item is on the ground, mark that the look needs to 646 /* if the item is on the ground, mark that the look needs to
645 * be updated. 647 * be updated.
… …
665 pl->contr->ns->send_packet (sl); 667 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT); 668 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 669}
668 670
669/** 671/**
670 * Tells the client to delete an item. Uses the item 672 * Tells the client to delete an item.
671 * command with a -1 location.
672 */ 673 */
673void 674void
674esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
675{ 676{
676 if (!pl->ns) 677 if (!pl->ns)
… …
800 tag_t tag = net_uint32 ((uint8 *)data + 1); 801 tag_t tag = net_uint32 ((uint8 *)data + 1);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 802 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 803
803 if (!op) 804 if (!op)
804 { 805 {
805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 806 pl->failmsg ("Could not find object to lock/unlock");
806 return; 807 return;
807 } 808 }
808 809
809 if (!flag) 810 if (!flag)
810 CLEAR_FLAG (op, FLAG_INV_LOCKED); 811 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
821 tag_t tag = net_uint32 ((uint8 *)data); 822 tag_t tag = net_uint32 ((uint8 *)data);
822 object *op = esrv_get_ob_from_count (pl->ob, tag); 823 object *op = esrv_get_ob_from_count (pl->ob, tag);
823 824
824 if (!op) 825 if (!op)
825 { 826 {
826 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 827 pl->failmsg ("Could not find object to mark");
827 return; 828 return;
828 } 829 }
829 830
830 pl->mark = op; 831 pl->mark = op;
831 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 832 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
832} 833}
833 834
834/** 835/**
835 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
836 * 837 *
… …
841look_at (player *pl, int dx, int dy) 842look_at (player *pl, int dx, int dy)
842{ 843{
843 dynbuf_text buf; 844 dynbuf_text buf;
844 object *ob = pl->ob; 845 object *ob = pl->ob;
845 846
847 if (!pl->observe->map)
848 return;
849
846 mapxy pos (pl->observe); 850 mapxy pos (pl->observe);
847 pos.move (dx, dy); 851 pos.move (dx, dy);
848 852
849 if (pos.normalise ()) 853 if (pos.normalise ())
850 for (object *tmp = pos->top; tmp; tmp = tmp->below) 854 for (object *tmp = pos->top; tmp; tmp = tmp->below)
… …
920 /* If it is an active container, then we should drop all objects 924 /* If it is an active container, then we should drop all objects
921 * in the container and not the container itself. 925 * in the container and not the container itself.
922 */ 926 */
923 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 927 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
924 { 928 {
925 object *current, *next; 929 int cnt = MAX_ITEM_PER_DROP;
926 930
927 for (current = op->inv; current != NULL; current = next) 931 for (object *current = op->inv; current; )
928 { 932 {
929 next = current->below; 933 object *next = current->below;
934
930 drop_object (pl, current, 0); 935 drop_object (pl, current, 0);
936
937 if (--cnt <= 0) break;
938
939 current = next;
931 } 940 }
932 941
933 esrv_update_item (UPD_WEIGHT, pl, op); 942 if (cnt <= 0)
943 op->failmsg ("Only dropped some items, can't drop that many items at once.");
934 } 944 }
935 else 945 else
936 drop_object (pl, op, nrof); 946 drop_object (pl, op, nrof);
947
948 update_after_inventory_change (pl);
937 949
938 return; 950 return;
939 } 951 }
940 else if (to == pl->count) 952 else if (to == pl->count)
941 { /* pick it up to the inventory */ 953 { /* pick it up to the inventory */
… …
959 * has already been done (eg, it can be picked up and fits in 971 * has already been done (eg, it can be picked up and fits in
960 * in a sack, so check for those things. We should also check 972 * in a sack, so check for those things. We should also check
961 * an make sure env is in fact a container for that matter. 973 * an make sure env is in fact a container for that matter.
962 */ 974 */
963 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 975 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
976 {
964 put_object_in_sack (pl, env, op, nrof); 977 put_object_in_sack (pl, env, op, nrof);
978 update_after_inventory_change (pl);
979 }
965} 980}
966 981

Diff Legend

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