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.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.60 by root, Tue Apr 22 07:01:47 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client/server logic. 26 * Client/server logic.
… …
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);
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
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);
… …
330 * Send the look window. Don't need to do animations here 330 * Send the look window. Don't need to do animations here
331 * This sends all the faces to the client, not just updates. This is 331 * This sends all the faces to the client, not just updates. This is
332 * because object ordering would otherwise be inconsistent. 332 * because object ordering would otherwise be inconsistent.
333 */ 333 */
334void 334void
335esrv_draw_look (object *pl) 335esrv_draw_look (player *pl)
336{ 336{
337 int got_one = 0, start_look = 0, end_look = 0; 337 int got_one = 0, start_look = 0, end_look = 0;
338 338
339 object *ob = pl->ob;
340
339 if (!pl->contr->ns->update_look) 341 if (!pl->ns->update_look)
340 { 342 {
341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); 343 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
342 return; 344 return;
343 } 345 }
344 else 346 else
345 pl->contr->ns->update_look = 0; 347 pl->ns->update_look = 0;
346 348
347 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (ob, FLAG_REMOVED)
348 || !pl->map 350 || !ob->map
349 || pl->map->in_memory != MAP_IN_MEMORY 351 || ob->map->in_memory != MAP_ACTIVE
350 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (ob->map, ob->x, ob->y))
351 return; 353 return;
352 354
353 pl->contr->ns->send_packet ("delinv 0"); 355 pl->ns->send_packet ("delinv 0");
354 356
355 packet sl; 357 packet sl;
356 sl.printf ("item%d ", pl->contr->ns->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
357 359
358 sl << uint32 (0); 360 sl << uint32 (0);
359 361
360 pl->contr->ns->send_face (empty_face); 362 pl->ns->send_face (empty_face, -50);
363 pl->ns->flush_fx ();
361 364
362 if (pl->contr->ns->look_position) 365 if (pl->ns->look_position)
363 { 366 {
364 char buf[80]; 367 char buf[80];
365 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
366 369
367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
368 << uint32 (0) 371 << uint32 (0)
369 << sint32 (-1) 372 << sint32 (-1)
370 << uint32 (empty_face) 373 << uint32 (empty_face)
371 << data8 (buf) 374 << data8 (buf)
372 << uint16 (0) 375 << uint16 (0)
373 << uint8 (0) 376 << uint8 (0)
374 << uint32 (0); 377 << uint32 (0);
375 378
376 if (pl->contr->ns->itemcmd == 2) 379 if (pl->ns->itemcmd == 2)
377 sl << uint16 (0); 380 sl << uint16 (0);
378 } 381 }
379 382
380 object *tmp = pl->ms ().top; 383 object *tmp = ob->ms ().top;
381 for (object *last = 0; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
382 { 385 {
383 object *head; 386 object *head;
384 387
385 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
… …
389 last = last->below; 392 last = last->below;
390 } 393 }
391 394
392 if (tmp->client_visible ()) 395 if (tmp->client_visible ())
393 { 396 {
394 if (++start_look < pl->contr->ns->look_position) 397 if (++start_look < pl->ns->look_position)
395 continue; 398 continue;
396 399
397 end_look++; 400 end_look++;
398 401
399 if (end_look > FLOORBOX_PAGESIZE) 402 if (end_look > FLOORBOX_PAGESIZE)
400 { 403 {
401 /* What we basically do is make a 'fake' object - when the user applies it, 404 /* What we basically do is make a 'fake' object - when the user applies it,
402 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
403 */ 406 */
404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
405 << uint32 (0) 408 << uint32 (0)
406 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
407 << uint32 (empty_face) 410 << uint32 (empty_face)
408 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
409 << uint16 (0) 412 << uint16 (0)
410 << uint8 (0) 413 << uint8 (0)
411 << uint32 (0); 414 << uint32 (0);
412 415
413 if (pl->contr->ns->itemcmd == 2) 416 if (pl->ns->itemcmd == 2)
414 sl << uint16 (0); 417 sl << uint16 (0);
415 418
416 break; 419 break;
417 } 420 }
418 421
419 if (tmp->head) 422 if (tmp->head)
420 head = tmp->head; 423 head = tmp->head;
421 else 424 else
422 head = tmp; 425 head = tmp;
423 426
424 add_object_to_socklist (*pl->contr->ns, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
425 got_one++; 428 got_one++;
426 429
427 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
428 { 431 {
429 pl->contr->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
430 433
431 sl.reset (); 434 sl.reset ();
432 sl.printf ("item%d ", pl->contr->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
433 sl << uint32 (0); 436 sl << uint32 (0);
434 got_one = 0; 437 got_one = 0;
435 } 438 }
436 } 439 }
437 } 440 }
438 441
439 if (got_one) 442 if (got_one)
440 pl->contr->ns->send_packet (sl); 443 pl->ns->send_packet (sl);
441 444
442} 445}
443 446
444/** 447/**
445 * Sends whole inventory. 448 * Sends whole inventory.
… …
476 479
477 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
478 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
479 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
480 */ 483 */
481 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
482 { 485 {
483 pl->contr->ns->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
484 487
485 sl.reset (); 488 sl.reset ();
486 sl.printf ("item%d ", pl->contr->ns->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
543 if (flags & UPD_FLAGS) 546 if (flags & UPD_FLAGS)
544 sl << uint32 (query_flags (op)); 547 sl << uint32 (query_flags (op));
545 548
546 if (flags & UPD_WEIGHT) 549 if (flags & UPD_WEIGHT)
547 { 550 {
548 sint32 weight = WEIGHT (op); 551 sint32 weight = op->client_weight ();
549 552
550 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
551 554
555#if 0
552 if (pl == op) 556 if (pl == op)
553 ns->last_weight = weight; 557 ns->last_weight = weight;
558#endif
554 } 559 }
555 560
556 if (flags & UPD_FACE) 561 if (flags & UPD_FACE)
557 { 562 {
558 ns->send_face (op->face); 563 ns->send_face (op->face, -50);
564 ns->flush_fx ();
559 sl << uint32 (op->face); 565 sl << uint32 (op->face);
560 } 566 }
561 567
562 if (flags & UPD_NAME) 568 if (flags & UPD_NAME)
563 { 569 {
… …
631 return; 637 return;
632 638
633 /* If this is not the player object, do some more checks */ 639 /* If this is not the player object, do some more checks */
634 if (op != pl) 640 if (op != pl)
635 { 641 {
636 /* We only send 'visibile' objects to the client */ 642 /* We only send 'visible' objects to the client */
637 if (!op->client_visible ()) 643 if (!op->client_visible ())
638 return; 644 return;
639 645
640 /* 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
641 * be updated. 647 * be updated.
… …
661 pl->contr->ns->send_packet (sl); 667 pl->contr->ns->send_packet (sl);
662 SET_FLAG (op, FLAG_CLIENT_SENT); 668 SET_FLAG (op, FLAG_CLIENT_SENT);
663} 669}
664 670
665/** 671/**
666 * Tells the client to delete an item. Uses the item 672 * Tells the client to delete an item.
667 * command with a -1 location.
668 */ 673 */
669void 674void
670esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
671{ 676{
672 if (!pl->ns) 677 if (!pl->ns)
… …
688 693
689/** 694/**
690 * Takes a player and object count (tag) and returns the actual object 695 * Takes a player and object count (tag) and returns the actual object
691 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
692 */ 697 */
693
694object * 698object *
695esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
696{ 700{
697 object *op, *tmp;
698
699 if (pl->count == count) 701 if (pl->count == count)
700 return pl; 702 return pl;
701 703
702 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
703 if (op->count == count) 705 if (op->count == count)
704 return op; 706 return op;
705 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
706 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
707 if (tmp->count == count) 709 if (tmp->count == count)
708 return tmp; 710 return tmp;
709 711
710 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 712 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
711 if (op->head && op->head->count == count) 713 if (op->head && op->head->count == count)
712 return op; 714 return op;
713 else if (op->count == count) 715 else if (op->count == count)
714 return op; 716 return op;
715 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
716 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
717 if (tmp->count == count) 719 if (tmp->count == count)
718 return tmp; 720 return tmp;
719 721
722#if 0
723 /* If the high bit is set, player examined a pseudo object. */
724 if (count & 0x80000000)
725 return 0;
726#endif
727
720 return 0; 728 return 0;
721} 729}
722 730
723
724/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
725void 732void
726ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
727{ 734{
728 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
729
730 /* If the high bit is set, player examined a pseudo object. */
731 if (tag & 0x80000000)
732 return;
733 736
734 object *op = esrv_get_ob_from_count (pl->ob, tag); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
735 738
736 if (!op) 739 if (!op)
737 { 740 {
738 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
739 return; 742 return;
740 } 743 }
741 744
742 examine (pl->ob, op); 745 examine (pl->ob, op);
746}
747
748/** Client wants to examine some object. So lets do so. */
749void
750ExCmd (char *buf, int len, player *pl)
751{
752 tag_t tag = atoi (buf);
753
754 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755 {
756 std::string s = op->describe (pl->ob);
757
758 packet sl ("ex");
759 sl << ber32 (tag) << s.c_str ();
760
761 pl->ns->send_packet (sl);
762 }
743} 763}
744 764
745/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
746void 766void
747ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
… …
781 tag_t tag = net_uint32 ((uint8 *)data + 1); 801 tag_t tag = net_uint32 ((uint8 *)data + 1);
782 object *op = esrv_get_ob_from_count (pl->ob, tag); 802 object *op = esrv_get_ob_from_count (pl->ob, tag);
783 803
784 if (!op) 804 if (!op)
785 { 805 {
786 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");
787 return; 807 return;
788 } 808 }
789 809
790 if (!flag) 810 if (!flag)
791 CLEAR_FLAG (op, FLAG_INV_LOCKED); 811 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
802 tag_t tag = net_uint32 ((uint8 *)data); 822 tag_t tag = net_uint32 ((uint8 *)data);
803 object *op = esrv_get_ob_from_count (pl->ob, tag); 823 object *op = esrv_get_ob_from_count (pl->ob, tag);
804 824
805 if (!op) 825 if (!op)
806 { 826 {
807 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 827 pl->failmsg ("Could not find object to mark");
808 return; 828 return;
809 } 829 }
810 830
811 pl->mark = op; 831 pl->mark = op;
812 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)));
813} 833}
814 834
815/** 835/**
816 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
817 * 837 *
818 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
819 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
820 */ 840 */
821void 841static void
822look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
823{ 843{
824 object *tmp; 844 dynbuf_text buf;
825 int flag = 0; 845 object *ob = pl->ob;
826 sint16 x, y;
827 maptile *m;
828 846
829 x = op->x + dx; 847 if (!pl->observe->map)
830 y = op->y + dy;
831
832 if (out_of_map (op->map, x, y))
833 return; 848 return;
834 849
835 m = get_map_from_coord (op->map, &x, &y); 850 mapxy pos (pl->observe);
836 if (!m) 851 pos.move (dx, dy);
852
853 if (pos.normalise ())
854 for (object *tmp = pos->top; tmp; tmp = tmp->below)
855 {
856 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
857 continue;
858
859 if (QUERY_FLAG (ob, FLAG_WIZ))
860 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
861 else
862 buf.printf ("- %s.\n", query_name (tmp));
863
864 object *head = tmp->head_ ();
865
866 if (head->inv)
867 if ((head->type != CONTAINER && head->type != FLESH)
868 || QUERY_FLAG (ob, FLAG_WIZ))
869 buf << head->query_inventory (ob, " ");
870
871 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
872 break;
873 }
874
875 if (buf.empty ())
876 pl->failmsg ("You see nothing there.");
877 else
878 pl->infobox (MSG_CHANNEL ("lookat"), buf);
879}
880
881/** Client wants to look at some object. Lets do so. */
882void
883LookAt (char *buf, int len, player *pl)
884{
885 char *cp;
886
887 int dx = atoi (buf);
888 if (!(cp = strchr (buf, ' ')))
837 return; 889 return;
838 890
839 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
840
841 for (; tmp != NULL; tmp = tmp->below)
842 {
843 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
844 continue;
845
846 if (!flag)
847 {
848 if (dx || dy)
849 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
850 else
851 {
852 clear_win_info (op);
853 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
854 }
855 flag = 1;
856 }
857
858 if (QUERY_FLAG (op, FLAG_WIZ))
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
860 else
861 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
862
863 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
864 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
865 inventory (op, tmp->head == NULL ? tmp : tmp->head);
866
867 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
868 break;
869 }
870
871 if (!flag)
872 {
873 if (dx || dy)
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
875 else
876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
877 }
878}
879
880/** Client wants to look at some object. Lets do so. */
881void
882LookAt (char *buf, int len, player *pl)
883{
884 int dx, dy;
885 char *cp;
886
887 dx = atoi (buf);
888 if (!(cp = strchr (buf, ' ')))
889 {
890 return;
891 }
892 dy = atoi (cp); 891 int dy = atoi (cp);
893 892
893 if (player *opl = pl->observe->contr)
894 if (client *ns = opl->ns)
895 {
894 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 896 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
895 return; 897 return;
896 898
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 899 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898 return; 900 return;
901 }
899 902
900 look_at (pl->ob, dx, dy); 903 look_at (pl, dx, dy);
901} 904}
902 905
903/** Move an object to a new location */ 906/** Move an object to a new location */
904void 907void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 908esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
921 /* 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
922 * in the container and not the container itself. 925 * in the container and not the container itself.
923 */ 926 */
924 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 927 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
925 { 928 {
926 object *current, *next; 929 int cnt = MAX_ITEM_PER_DROP;
927 930
928 for (current = op->inv; current != NULL; current = next) 931 for (object *current = op->inv; current; )
929 { 932 {
930 next = current->below; 933 object *next = current->below;
934
931 drop_object (pl, current, 0); 935 drop_object (pl, current, 0);
936
937 if (--cnt <= 0) break;
938
939 current = next;
932 } 940 }
933 941
934 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.");
935 } 944 }
936 else 945 else
937 drop_object (pl, op, nrof); 946 drop_object (pl, op, nrof);
947
948 update_after_inventory_change (pl);
938 949
939 return; 950 return;
940 } 951 }
941 else if (to == pl->count) 952 else if (to == pl->count)
942 { /* pick it up to the inventory */ 953 { /* pick it up to the inventory */
… …
960 * 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
961 * 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
962 * 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.
963 */ 974 */
964 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 {
965 put_object_in_sack (pl, env, op, nrof); 977 put_object_in_sack (pl, env, op, nrof);
978 update_after_inventory_change (pl);
979 }
966} 980}
967 981

Diff Legend

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