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.57 by elmex, Mon Nov 26 12:54:32 2007 UTC vs.
Revision 1.60 by root, Tue Apr 22 07:01:47 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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
… …
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)
… …
923 /* 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
924 * in the container and not the container itself. 925 * in the container and not the container itself.
925 */ 926 */
926 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 927 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
927 { 928 {
928 object *current, *next;
929
930 int cnt = MAX_ITEM_PER_DROP; 929 int cnt = MAX_ITEM_PER_DROP;
931 930
932 for (current = op->inv; current != NULL; current = next) 931 for (object *current = op->inv; current; )
933 { 932 {
934 next = current->below; 933 object *next = current->below;
934
935 drop_object (pl, current, 0); 935 drop_object (pl, current, 0);
936 936
937 if (--cnt <= 0) break; 937 if (--cnt <= 0) break;
938
939 current = next;
938 } 940 }
939 941
940 if (cnt <= 0) 942 if (cnt <= 0)
941 op->failmsg ("Only dropped some items, can't drop that many items at once."); 943 op->failmsg ("Only dropped some items, can't drop that many items at once.");
942
943 esrv_update_item (UPD_WEIGHT, pl, op);
944 } 944 }
945 else 945 else
946 drop_object (pl, op, nrof); 946 drop_object (pl, op, nrof);
947 947
948 update_after_inventory_change (pl); 948 update_after_inventory_change (pl);

Diff Legend

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